open_platform/ss-common-purchase
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangpengfei
2024-09-04 18:00:41 +08:00
parent 4bec6658ec a3f8e1647a
commit 2308dabd26
7 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillExVo.java
View File

@@ -68,4 +68,9 @@ public class PurchaseBillExVo implements Vo {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("最后修改时间")
private Date modifyTime;
@ApiModelProperty("收货状态value")
private String receiveStateValue;
@ApiModelProperty("发货状态value")
private String deliveryStateValue;
}

6
src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml
View File

@@ -56,12 +56,14 @@
when 2 then '已审核'
when 3 then '审核未通过' end as state,
SUM(pbd.amount) AS amountTotal,
pba.thisPayAmount,
SUM(pbd.taxAmount) AS taxAmount,
SUM(pbd.count) AS countTotal,
pb.`remarks`,
pb.`createByName`,
pb.`modifyTime`
pb.`modifyTime`,
pba.prepayment AS thisPayAmount,
pbe.receiveStateValue,
pbe.deliveryStateValue
FROM
purchase_bill pb
LEFT JOIN purchase_bill_detail pbd

3
src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java
View File

@@ -65,4 +65,7 @@ public class PurchaseBillQuery implements Query {
@ApiModelProperty("用户sid")
private String userSid;
private int index;
@ApiModelProperty("审核状态key")
private String examineStateKey;
}

24
src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java
View File

@@ -72,8 +72,6 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
private PurchaseAppendixService purchaseAppendixService;
@Autowired
private PurchaseFlowNodeService purchaseFlowNodeService;
@Autowired
private FileUploadComponent fileUploadComponent;
public ResultBean<PagerVo<PurchaseBillVo>> listPageVo(PagerQuery<PurchaseBillQuery> pq) {
ResultBean rb = ResultBean.fireFail();
@@ -199,6 +197,9 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
if (StringUtils.isNotBlank(query.getGoodsSid())) {
qw.like("pbd.goodsSkuSid", query.getGoodsSid());
}
if (StringUtils.isNotBlank(query.getExamineStateKey())) {
qw.like("pb.state", query.getExamineStateKey());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (pb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@@ -244,9 +245,6 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
//保存商品信息
for (PurchaseBillDetailDto purchaseBillDetailDto : purchaseBillDetailList) {
purchaseBillDetailDto.setBillSid(sid);
String goodsImgUrl = purchaseBillDetailDto.getGoodsImgUrl();
goodsImgUrl = goodsImgUrl.replace(fileUploadComponent.getUrlPrefix(), "");
purchaseBillDetailDto.setGoodsImgUrl(goodsImgUrl);
String detailSid = purchaseBillDetailService.insertByDto(purchaseBillDetailDto);
PurchaseBillBatchDto purchaseBillBatchDto = new PurchaseBillBatchDto();
purchaseBillBatchDto.setBillSid(sid);
@@ -259,10 +257,9 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
//保存附件信息
for (PurchaseAppendixUrl purchaseAppendixUrl : purchaseAppendixList) {
PurchaseAppendixDto purchaseAppendixDto = new PurchaseAppendixDto();
String filePath = purchaseAppendixUrl.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
purchaseAppendixDto.setLinkSid(sid);
purchaseAppendixDto.setAttachType(PurchaseFileEnum.PURCHASEBILL.getAttachType());
purchaseAppendixDto.setFilePath(filePath);
purchaseAppendixDto.setFilePath(purchaseAppendixUrl.getUrl());
purchaseAppendixService.insertByDto(purchaseAppendixDto);
}
//保存操作日志
@@ -290,9 +287,6 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
//保存商品信息
for (PurchaseBillDetailDto purchaseBillDetailDto : purchaseBillDetailList) {
purchaseBillDetailDto.setBillSid(dtoSid);
String goodsImgUrl = purchaseBillDetailDto.getGoodsImgUrl();
goodsImgUrl = goodsImgUrl.replace(fileUploadComponent.getUrlPrefix(), "");
purchaseBillDetailDto.setGoodsImgUrl(goodsImgUrl);
String detailSid = purchaseBillDetailService.insertByDto(purchaseBillDetailDto);
PurchaseBillBatchDto purchaseBillBatchDto = new PurchaseBillBatchDto();
purchaseBillBatchDto.setBillSid(dtoSid);
@@ -305,10 +299,9 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
//保存附件信息
for (PurchaseAppendixUrl purchaseAppendixUrl : purchaseAppendixList) {
PurchaseAppendixDto purchaseAppendixDto = new PurchaseAppendixDto();
String filePath = purchaseAppendixUrl.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
purchaseAppendixDto.setLinkSid(dtoSid);
purchaseAppendixDto.setAttachType(PurchaseFileEnum.PURCHASEBILL.getAttachType());
purchaseAppendixDto.setFilePath(filePath);
purchaseAppendixDto.setFilePath(purchaseAppendixUrl.getUrl());
purchaseAppendixService.insertByDto(purchaseAppendixDto);
}
return dtoSid;
@@ -422,9 +415,7 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
for (PurchaseBillDetailDetailsVo purchaseBillDetailDetailsVo : purchaseBillDetailDetailsVos) {
purchaseBillDetailDetailsVo.setCost1(purchaseBillDetailDetailsVo.getCost());
purchaseBillDetailDetailsVo.setCount1(purchaseBillDetailDetailsVo.getCount());
String goodsImgUrl = purchaseBillDetailDetailsVo.getGoodsImgUrl();
goodsImgUrl = fileUploadComponent.getUrlPrefix() + goodsImgUrl;
purchaseBillDetailDetailsVo.setGoodsImgUrl(goodsImgUrl);
purchaseBillDetailDetailsVo.setDiscountRate1(purchaseBillDetailDetailsVo.getDiscountRate());
for (PurchaseBillBatchDetailsVo purchaseBillBatchDetailsVo : purchaseBillBatchDetailsVos) {
purchaseBillDetailDetailsVo.setBatchNumber(purchaseBillBatchDetailsVo.getBatchNumber());
purchaseBillDetailDetailsVo.setExpireDate(purchaseBillBatchDetailsVo.getExpireDate());
@@ -436,8 +427,7 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
List<PurchaseAppendixUrl> purchaseAppendixUrlList = new ArrayList<>();
for (PurchaseAppendixDetailsVo purchaseAppendixDetailsVo : purchaseAppendixDetailsVos) {
PurchaseAppendixUrl purchaseAppendixUrl = new PurchaseAppendixUrl();
String url = fileUploadComponent.getUrlPrefix() + purchaseAppendixDetailsVo.getFilePath();
purchaseAppendixUrl.setUrl(url);
purchaseAppendixUrl.setUrl(purchaseAppendixDetailsVo.getFilePath());
purchaseAppendixUrlList.add(purchaseAppendixUrl);
}
vo.setPurchaseAppendixList(purchaseAppendixUrlList);

3
src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetail.java
View File

@@ -97,4 +97,7 @@ public class PurchaseBillDetail extends BaseEntity {
private BigDecimal unTaxPrice;
@ApiModelProperty("未含税总价（未含税价*采购数量）")
private BigDecimal unTaxTotalAmount;
@ApiModelProperty("保质期")
private Integer shelfLife;
}

5
src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java
View File

@@ -77,7 +77,8 @@ public class PurchaseBillDetailDetailsVo implements Vo {
@ApiModelProperty("吊牌价")
private BigDecimal tagPrice;
@ApiModelProperty("折扣率")
private BigDecimal discountRate; // 折扣率
private BigDecimal discountRate;
private BigDecimal discountRate1;
@ApiModelProperty("折后单价")
private BigDecimal discountPrice; // 折后单价
@ApiModelProperty("分摊金额")
@@ -99,6 +100,8 @@ public class PurchaseBillDetailDetailsVo implements Vo {
private Date deliveryDate;
@ApiModelProperty("总税额")
private BigDecimal taxAmount;
@ApiModelProperty("保质期")
private Integer shelfLife;
/*
* 商品扩展字段

2
src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDto.java
View File

@@ -95,6 +95,8 @@ public class PurchaseBillDetailDto implements Dto {
private String deliveryDate;
@ApiModelProperty("总税额")
private BigDecimal taxAmount;
@ApiModelProperty("保质期")
private Integer shelfLife;
/*
* 商品扩展字段