Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 4 weeks ago
parent
commit
5fbfa3ea06
  1. 146
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java
  2. 98
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/pms/pmspurchasebill/PmsPurchaseBillDetailDetailsVo.java
  3. 175
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java
  4. 25
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/pms/pmspurchasebill/PmsPurchaseBillFeign.java
  5. 81
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/pms/pmspurchasebill/PmsPurchaseBillInvoiceDetailsVo.java
  6. 79
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/pms/pmspurchasebill/PmsPurchasePayDetailsVo.java

146
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java

@ -4,9 +4,11 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.config.component.DocPdfComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.base.utils.WordConvertUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -23,6 +25,8 @@ import com.yxt.wms.biz.inventory.wmsshelfbill.WmsShelfBillDto;
import com.yxt.wms.biz.inventory.wmsshelfbill.WmsShelfBillService;
import com.yxt.wms.biz.inventory.wmsshelfbilldetail.WmsShelfBillDetailDto;
import com.yxt.wms.biz.inventory.wmsshelfbilldetail.WmsShelfBillDetailService;
import com.yxt.wms.feign.pms.pmspurchasebill.PmsPurchaseBillDetailsVo;
import com.yxt.wms.feign.pms.pmspurchasebill.PmsPurchaseBillFeign;
import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
@ -32,6 +36,8 @@ import com.yxt.wms.utils.Rule;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.File;
import java.io.InputStream;
import java.math.BigDecimal;
import java.util.*;
@ -43,6 +49,8 @@ import java.util.*;
@Service
public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapper, WmsReceiptBill> {
@Autowired
private DocPdfComponent docPdfComponent;
@Autowired
private WmsReceiptBillDetailService wmsReceiptBillDetailService;
@Autowired
@ -63,6 +71,9 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
private WmsShelfBillDetailService wmsShelfBillDetailService;
@Autowired
private WmsShelfBillService wmsShelfBillService;
@Autowired
private PmsPurchaseBillFeign pmsPurchaseBillFeign;
public PagerVo<WmsReceiptBillPageVo> listPage(PagerQuery<WmsReceiptBillQuery> pq) {
WmsReceiptBillQuery query = pq.getParams();
QueryWrapper<WmsReceiptBill> qw = new QueryWrapper<>();
@ -182,12 +193,11 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
}
/**
*
* @param dto
* @param type 0 保存1确认
* @return
*/
public ResultBean<String> saveOrUpdateBill2(WmsReceiptBillDto2 dto,int type) {
public ResultBean<String> saveOrUpdateBill2(WmsReceiptBillDto2 dto, int type) {
ResultBean<String> rb = ResultBean.fireFail();
String sid = dto.getSid();
if (StringUtils.isBlank(sid)) {
@ -387,7 +397,7 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
}
}
dto.setList(list);
ResultBean<String> resultBean = saveOrUpdateBill2(dto,1);
ResultBean<String> resultBean = saveOrUpdateBill2(dto, 1);
String sid = resultBean.getData();
WmsReceiptBill wmsReceiptBill = fetchBySid(sid);
if (null != wmsReceiptBill) {
@ -477,10 +487,136 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
if (null != wmsReceiptBill) {
vo.setDate(DateUtil.formatDate(wmsReceiptBill.getCreateTime()));
vo.setCreateByName(wmsReceiptBill.getCreateByName());
SysOrganizationVo createOrg = sysOrganizationFeign.fetchBySid(wmsReceiptBill.getCreateOrgSid()).getData();
vo.setUseOrgName(createOrg.getName() + "(" + wmsReceiptBill.getDeptName() + ")");
vo.setBillNo(wmsReceiptBill.getBillNo());
vo.setCreateByName(wmsReceiptBill.getCreateByName());
String ansBillSid = wmsReceiptBill.getSourceBillSid();
WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(ansBillSid);
String pmsBillSid = wmsAnsBill.getSourceBillSid();
PmsPurchaseBillDetailsVo pmsVo = pmsPurchaseBillFeign.fetchDetailsBySid(pmsBillSid).getData();
if (null != pmsVo) {
if (StringUtils.isNotBlank(pmsVo.getManufacturersOrderNumber())) {
vo.setManufacturersOrderNumber(pmsVo.getManufacturersOrderNumber());
} else {
vo.setManufacturersOrderNumber("");
}
if (StringUtils.isNotBlank(pmsVo.getSupplierName())) {
vo.setSupplierName(pmsVo.getSupplierName());
} else {
vo.setSupplierName("");
}
if (StringUtils.isNotBlank(pmsVo.getSupplierPhone())) {
vo.setSupplierPhone(pmsVo.getSupplierPhone());
} else {
vo.setSupplierPhone("");
}
if (StringUtils.isNotBlank(pmsVo.getPurchasingAgent())) {
vo.setPurchasingAgent(pmsVo.getPurchasingAgent());
} else {
vo.setPurchasingAgent(pmsVo.getCreateByName());
}
}
List<WmsReceiptBillPdfListVo> pdfListVos = new ArrayList<>();
List<WmsReceiptBillDetail> details = wmsReceiptBillDetailService.selByBillSid(wmsReceiptBill.getSid());
BigDecimal money = BigDecimal.ZERO;//合计金额
if (!details.isEmpty()) {
for (int i = 0; i < details.size(); i++) {
WmsReceiptBillDetail detail = details.get(i);
WmsReceiptBillPdfListVo listVo = new WmsReceiptBillPdfListVo();
BeanUtil.copyProperties(detail, listVo);
listVo.setSortNo(String.valueOf(i + 1));
pdfListVos.add(listVo);
money = money.add(detail.getAmount());
}
vo.setList(pdfListVos);
}
vo.setBigMoney(bigDecimalToLocalStr(money));
vo.setMoney(money.toString());
}
filePath = createPdf(vo);
return rb.success().setData(filePath);
}
private String createPdf(WmsReceiptBillPdfVo vo) {
String finalPath = "";
Map<String, Object> dataMap = new HashMap();
List<Map<String, Object>> list = new ArrayList<>();
dataMap.put("useOrgName", vo.getUseOrgName());
dataMap.put("date", vo.getDate());
dataMap.put("billNo", vo.getBillNo());
dataMap.put("manufacturersOrderNumber", vo.getManufacturersOrderNumber());
dataMap.put("supplierName", vo.getSupplierName());
dataMap.put("supplierPhone", vo.getSupplierPhone());
dataMap.put("bigMoney", vo.getBigMoney());
dataMap.put("money", vo.getMoney());
dataMap.put("purchasingAgent", vo.getPurchasingAgent());
dataMap.put("createByName", vo.getCreateByName());
List<WmsReceiptBillPdfListVo> items = vo.getList();
if (!items.isEmpty()) {
for (WmsReceiptBillPdfListVo itemPdfVo : items) {
Map<String, Object> map = new HashMap<>();
map.put("sortNo", itemPdfVo.getSortNo());
map.put("goodsSpuName", itemPdfVo.getGoodsSpuName());
map.put("goodsSkuCode", itemPdfVo.getGoodsSkuCode());
map.put("goodsSkuOwnSpec", itemPdfVo.getGoodsSkuOwnSpec());
map.put("unit", itemPdfVo.getUnit());
map.put("actualInCount", itemPdfVo.getActualInCount());
map.put("taxPrice", itemPdfVo.getTaxPrice());
map.put("amount", itemPdfVo.getAmount());
map.put("remarks", itemPdfVo.getRemarks());
list.add(map);
}
}
dataMap.put("list", list);
String temp = "/template/";
String targetPath = docPdfComponent.getUploadTemplateUrl();
try {
//获取模板
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/pjcgrkd.ftl");
//生成word文件名
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
long seconds = System.currentTimeMillis();
String typeName = dateStr + seconds + ".doc";
File file = new File(targetPath + "templatePdf" + seconds + ".ftl");
File dir = new File(targetPath);
WordConvertUtils.inputStreamToFile(inputStream, file);
WordConvertUtils.creatWord1(dataMap, file, targetPath, typeName, dir);
//新生成的word路径
String wordPath = targetPath + typeName;
String pdfName = "配件采购入库单" + dateStr + seconds + ".pdf";
WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
finalPath = temp + pdfName;
} catch (NoClassDefFoundError e) {
e.printStackTrace();
finalPath = targetPath;
}
return finalPath;
}
return rb.success().setData(filePath);
public static String bigDecimalToLocalStr(BigDecimal bigDecimal) {
String[] chinese = new String[]{"", "拾", "佰", "仟", "万", "拾", "佰", "仟", "亿", "拾", "佰", "仟", "万"};
String[] numChinese = new String[]{"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"};
String[] afterChinese = new String[]{"角", "分"};
String str = String.valueOf(bigDecimal);
String[] arr = str.split("\\.");
char[] chars = arr[0].toCharArray();
StringBuffer sb = new StringBuffer();
for (int i = 0; i < chars.length; ++i) {
sb.append(numChinese[Integer.valueOf(String.valueOf(chars[i])).intValue()]).append(chinese[chars.length - i - 1]);
}
if (arr.length == 1) {
return sb.toString() + "元整";
} else if (arr[1].length() > 2) {
throw new IllegalArgumentException("人民币大写转换BigDecimal只能保留2位小数");
} else {
sb.append("元");
char[] chars1 = arr[1].toCharArray();
for (int i = 0; i < chars1.length; ++i) {
sb.append(numChinese[Integer.valueOf(String.valueOf(chars1[i])).intValue()]).append(afterChinese[i]);
}
return sb.toString();
}
}
}

98
yxt-wms-biz/src/main/java/com/yxt/wms/feign/pms/pmspurchasebill/PmsPurchaseBillDetailDetailsVo.java

@ -0,0 +1,98 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.feign.pms.pmspurchasebill;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchaseBillDetailVo.java <br/>
* Class: com.yxt.pms.api.pmspurchasebilldetail.PmsPurchaseBillDetailVo <br/>
* Description: 采购单据明细 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单据明细 视图数据详情", description = "采购单据明细 视图数据详情")
public class PmsPurchaseBillDetailDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("商品基础信息Sid")
private String goodsSpuSid; // 商品基础信息Sid
@ApiModelProperty("商品名称")
private String goodsSpuName; // 商品名称
@ApiModelProperty("商品Skusid")
private String goodsSkuSid; // 商品Skusid
@ApiModelProperty("商品Sku名称")
private String goodsSkuTitle; // 商品Sku名称
@ApiModelProperty("商品编码(图号)")
private String goodsSkuCode; // 商品编码(图号)
@ApiModelProperty("规格型号")
private String goodsSkuOwnSpec; // 规格型号
@ApiModelProperty("单位")
private String unit;
@ApiModelProperty("仓库sid")
private String warehouseSid; // 仓库sid
@ApiModelProperty("仓库名称")
private String warehouseName; // 仓库名称
@ApiModelProperty("单位成本(进货价)")
private BigDecimal cost; // 单位成本(进货价)
@ApiModelProperty("采购数量")
private BigDecimal count; // 采购数量
@ApiModelProperty("税额")
private BigDecimal taxAmount; // 税额
@ApiModelProperty("含税价")
private BigDecimal taxPrice; // 含税价
@ApiModelProperty("采购金额")
private BigDecimal amount; // 采购金额
@ApiModelProperty("厂家sid")
private String manufacturerSid;
@ApiModelProperty("厂家名称")
private String manufacturerName;
@ApiModelProperty("已退数量")
private BigDecimal returnedCount;
}

175
yxt-wms-biz/src/main/java/com/yxt/wms/feign/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java

@ -0,0 +1,175 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.feign.pms.pmspurchasebill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchaseBillVo.java <br/>
* Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillVo <br/>
* Description: 采购单 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单 视图数据详情", description = "采购单 视图数据详情")
public class PmsPurchaseBillDetailsVo implements Vo {
private String sid;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("申请日期")
@JsonFormat(
pattern = "yyyy-MM-dd",
timezone = "GMT+8"
)
private Date createTime;
@ApiModelProperty("制单人sid")
private String createBySid;
@ApiModelProperty("制单人姓名")
private String createByName;
@ApiModelProperty("来源单sid(工单sid)")
private String sourceBillSid;
@ApiModelProperty("来源单编号/外部编号")
private String sourceBillNo;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("经营品牌Key")
private String operateBrandKey;
@ApiModelProperty("经营品牌Value")
private String operateBrandValue;
@ApiModelProperty("仓库类型Key")
private String warehouseTypeKey;
@ApiModelProperty("仓库类型Value")
private String warehouseTypeValue;
@ApiModelProperty("采购类型Key")
private String purchaseTypeKey;
@ApiModelProperty("采购类型Value(厂家采购、外采、其他)")
private String purchaseTypeValue;
@ApiModelProperty("采购原因key")
private String purchaseReasonKey;
@ApiModelProperty("采购原因(储备/客户订单/在修车辆)")
private String purchaseReasonValue;
@ApiModelProperty("付款方式key")
private String payTypeKey;
@ApiModelProperty("付款方式value(预付款/月结/单笔付款)")
private String payTypeValue;
@ApiModelProperty("厂家订单类型key")
private String manufacturersOrderTypeKey;
@ApiModelProperty("厂家订单类型value")
private String manufacturersOrderTypeValue;
@ApiModelProperty("厂家订单号")
private String manufacturersOrderNumber;
@ApiModelProperty("误差调整金额")
private BigDecimal errorAmount;
@ApiModelProperty("供应商sid")
private String supplierSid;
@ApiModelProperty("供应商名称")
private String supplierName;
@ApiModelProperty("供应商联系电话")
private String supplierPhone;
@ApiModelProperty("采购员sid(单选)")
private String purchaserSid;
@ApiModelProperty("采购员姓名")
private String purchaserName;
@ApiModelProperty("预计到货日期")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date deliveryDate;
@ApiModelProperty("运费")
private BigDecimal freight;
@ApiModelProperty("优惠金额")
private BigDecimal discountAmount;
@ApiModelProperty("应付金额(=采购金额+运费-优惠金额)")
private BigDecimal payableAmount;
@ApiModelProperty("当前预付款项金额")
private BigDecimal prepaymentAmount;
@ApiModelProperty("累计欠款金额")
private BigDecimal owedAmount;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("使用组织sid")
private String useOrgSid;
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("采购人")
private String purchasingAgent;
@ApiModelProperty("采购人sid")
private String purchasingAgentSid;
@ApiModelProperty("付款信息")
private PmsPurchasePayDetailsVo purchasePay;
@ApiModelProperty("发票信息")
private PmsPurchaseBillInvoiceDetailsVo purchaseBillInvoice;
@ApiModelProperty("采购单商品明细")
private List<PmsPurchaseBillDetailDetailsVo> pmsPurchaseBillDetailList;
}

25
yxt-wms-biz/src/main/java/com/yxt/wms/feign/pms/pmspurchasebill/PmsPurchaseBillFeign.java

@ -0,0 +1,25 @@
package com.yxt.wms.feign.pms.pmspurchasebill;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
/**
* @description:
* @author: dimengzhe
* @date: 2024/3/20
**/
@FeignClient(
contextId = "yxt-pms-PmsPurchaseBill",
name = "yxt-pms",
path = "v1/pmspurchasebill"
)
public interface PmsPurchaseBillFeign {
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<PmsPurchaseBillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
}

81
yxt-wms-biz/src/main/java/com/yxt/wms/feign/pms/pmspurchasebill/PmsPurchaseBillInvoiceDetailsVo.java

@ -0,0 +1,81 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.feign.pms.pmspurchasebill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* Project: yxt-pms(采购发票) <br/>
* File: PmsPurchaseBillInvoiceVo.java <br/>
* Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoiceVo <br/>
* Description: 采购单-发票 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单-发票 视图数据详情", description = "采购单-发票 视图数据详情")
public class PmsPurchaseBillInvoiceDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否需要开发票(是1,否0)")
private String isInvoicing; // 是否需要开发票(是1,否0)
@ApiModelProperty("票据类型key")
private String billTypeKey; // 票据类型key
@ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)")
private String billType; // 票据类型(不含税、增值税、普通税、已含增值税)
@ApiModelProperty("开票名称")
private String invoicingName; // 开票名称
@ApiModelProperty("税号")
private String taxpayerNo; // 税号
@ApiModelProperty("发票代码")
private String invoiceCode; // 发票代码
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("开票日期")
private Date invoiceDate; // 开票日期
@ApiModelProperty("发票金额")
private BigDecimal invoiceAmount; // 发票金额
@ApiModelProperty("税率")
private BigDecimal taxRate; // 税率
}

79
yxt-wms-biz/src/main/java/com/yxt/wms/feign/pms/pmspurchasebill/PmsPurchasePayDetailsVo.java

@ -0,0 +1,79 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.feign.pms.pmspurchasebill;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasePayVo.java <br/>
* Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePayVo <br/>
* Description: 付款说明 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-06 15:43:39 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款说明 视图数据详情", description = "付款说明 视图数据详情")
public class PmsPurchasePayDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否先付货款 0否,1是")
private String isFirstPay; // 是否先付货款 0否,1是
@ApiModelProperty("订金")
private BigDecimal deposit; // 订金
@ApiModelProperty("货款")
private BigDecimal goodsMoney; // 货款
@ApiModelProperty("收款账户")
private String accountName; // 收款账户
@ApiModelProperty("开户行")
private String bankName; // 开户行
@ApiModelProperty("收款账号")
private String bankAccount; // 收款账号
@ApiModelProperty("其他费用名称")
private String otherAmountName; // 其他费用名称
@ApiModelProperty("其他费用金额")
private BigDecimal otherAmount; // 其他费用金额
@ApiModelProperty("付款备注")
private String payRemark; // 付款备注
}
Loading…
Cancel
Save