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

oms采购单调整

Browse Source
This commit is contained in:
God
2024-07-24 10:37:54 +08:00
parent ddf49391c3
commit 4b2663910e
12 changed files with 77 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDetailsVo.java
View File

@@ -31,6 +31,8 @@ import com.yxt.common.core.vo.Vo;
import com.yxt.purchase.biz.purchaseappendix.PurchaseAppendixUrl;
import com.yxt.purchase.biz.purchasebillamount.PurchaseBillAmountDetailsVo;
import com.yxt.purchase.biz.purchasebillamount.PurchaseBillAmountDto;
import com.yxt.purchase.biz.purchasebillbatch.PurchaseBillBatchDetailsVo;
import com.yxt.purchase.biz.purchasebillbatch.PurchaseBillBatchDto;
import com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailDetailsVo;
import com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailDto;
import com.yxt.purchase.biz.purchasebillextend.PurchaseBillExtendDetailsVo;
@@ -106,6 +108,8 @@ public class PurchaseBillDetailsVo implements Vo {
private PurchaseBillExtendDetailsVo purchaseBillExtend;
@ApiModelProperty("采购单商品明细")
private List<PurchaseBillDetailDetailsVo> purchaseBillDetailList;
@ApiModelProperty("采购商品扩展")
private List<PurchaseBillBatchDetailsVo> purchaseBillBatchList;
@ApiModelProperty("附件")
private List<PurchaseAppendixUrl> purchaseAppendixList = new ArrayList<>();
}

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

@@ -30,6 +30,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.dto.Dto;
import com.yxt.purchase.biz.purchaseappendix.PurchaseAppendixUrl;
import com.yxt.purchase.biz.purchasebillamount.PurchaseBillAmountDto;
import com.yxt.purchase.biz.purchasebillbatch.PurchaseBillBatchDto;
import com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailDto;
import com.yxt.purchase.biz.purchasebillextend.PurchaseBillExtendDto;
import com.yxt.purchase.biz.purchasebillinvoice.PurchaseBillInvoiceDto;
@@ -103,6 +104,8 @@ public class PurchaseBillDto implements Dto {
private PurchaseBillExtendDto purchaseBillExtend;
@ApiModelProperty("采购单商品明细")
private List<PurchaseBillDetailDto> purchaseBillDetailList;
@ApiModelProperty("采购商品扩展")
private List<PurchaseBillBatchDto> purchaseBillBatchList;
@ApiModelProperty("附件")
private List<PurchaseAppendixUrl> purchaseAppendixList = new ArrayList<>();
}

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

@@ -38,6 +38,9 @@ import com.yxt.purchase.biz.purchaseappendix.*;
import com.yxt.purchase.biz.purchasebillamount.PurchaseBillAmountDetailsVo;
import com.yxt.purchase.biz.purchasebillamount.PurchaseBillAmountDto;
import com.yxt.purchase.biz.purchasebillamount.PurchaseBillAmountService;
import com.yxt.purchase.biz.purchasebillbatch.PurchaseBillBatchDetailsVo;
import com.yxt.purchase.biz.purchasebillbatch.PurchaseBillBatchDto;
import com.yxt.purchase.biz.purchasebillbatch.PurchaseBillBatchService;
import com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailDetailsVo;
import com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailDto;
import com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailService;
@@ -60,6 +63,8 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
@Autowired
private PurchaseBillDetailService purchaseBillDetailService;
@Autowired
private PurchaseBillBatchService purchaseBillBatchService;
@Autowired
private PurchaseAppendixService purchaseAppendixService;
@Autowired
private FileUploadComponent fileUploadComponent;
@@ -112,6 +117,7 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
PurchaseBillAmountDto purchaseBillAmount = dto.getPurchaseBillAmount();
PurchaseBillExtendDto purchaseBillExtend = dto.getPurchaseBillExtend();
List<PurchaseBillDetailDto> purchaseBillDetailList = dto.getPurchaseBillDetailList();
List<PurchaseBillBatchDto> purchaseBillBatchList = dto.getPurchaseBillBatchList();
List<PurchaseAppendixUrl> purchaseAppendixList = dto.getPurchaseAppendixList();
if (StringUtils.isBlank(dtoSid)) {
String sid = this.insertByDto(dto);
@@ -124,7 +130,15 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
//保存商品信息
for (PurchaseBillDetailDto purchaseBillDetailDto : purchaseBillDetailList) {
purchaseBillDetailDto.setBillSid(sid);
purchaseBillDetailService.insertByDto(purchaseBillDetailDto);
String goodsImgUrl = purchaseBillDetailDto.getGoodsImgUrl();
goodsImgUrl = goodsImgUrl.replace(fileUploadComponent.getUrlPrefix(), "");
purchaseBillDetailDto.setGoodsImgUrl(goodsImgUrl);
String detailSid = purchaseBillDetailService.insertByDto(purchaseBillDetailDto);
for (PurchaseBillBatchDto purchaseBillBatchDto : purchaseBillBatchList) {
purchaseBillBatchDto.setBillSid(sid);
purchaseBillBatchDto.setBillDetailSid(detailSid);
purchaseBillBatchService.insertByDto(purchaseBillBatchDto);
}
}
//保存附件信息
for (PurchaseAppendixUrl purchaseAppendixUrl : purchaseAppendixList) {
@@ -141,6 +155,7 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
purchaseBillAmountService.delByMainSid(dtoSid);
purchaseBillExtendService.delByMainSid(dtoSid);
purchaseBillDetailService.delByMainSid(dtoSid);
purchaseBillBatchService.delByMainSid(dtoSid);
purchaseAppendixService.delByLinkSid(dtoSid);
//保存采购单费用/预付款
purchaseBillAmount.setBillSid(dtoSid);
@@ -151,7 +166,15 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
//保存商品信息
for (PurchaseBillDetailDto purchaseBillDetailDto : purchaseBillDetailList) {
purchaseBillDetailDto.setBillSid(dtoSid);
purchaseBillDetailService.insertByDto(purchaseBillDetailDto);
String goodsImgUrl = purchaseBillDetailDto.getGoodsImgUrl();
goodsImgUrl = goodsImgUrl.replace(fileUploadComponent.getUrlPrefix(), "");
purchaseBillDetailDto.setGoodsImgUrl(goodsImgUrl);
String detailSid = purchaseBillDetailService.insertByDto(purchaseBillDetailDto);
for (PurchaseBillBatchDto purchaseBillBatchDto : purchaseBillBatchList) {
purchaseBillBatchDto.setBillSid(dtoSid);
purchaseBillBatchDto.setBillDetailSid(detailSid);
purchaseBillBatchService.insertByDto(purchaseBillBatchDto);
}
}
//保存附件信息
for (PurchaseAppendixUrl purchaseAppendixUrl : purchaseAppendixList) {
@@ -191,7 +214,14 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
PurchaseBillExtendDetailsVo purchaseBillExtendDetailsVo = purchaseBillExtendService.selByMainSid(sid);
vo.setPurchaseBillExtend(purchaseBillExtendDetailsVo);
List<PurchaseBillDetailDetailsVo> purchaseBillDetailDetailsVos = purchaseBillDetailService.selByMainSid(sid);
for (PurchaseBillDetailDetailsVo purchaseBillDetailDetailsVo : purchaseBillDetailDetailsVos) {
String goodsImgUrl = purchaseBillDetailDetailsVo.getGoodsImgUrl();
goodsImgUrl = fileUploadComponent.getUrlPrefix() + goodsImgUrl;
purchaseBillDetailDetailsVo.setGoodsImgUrl(goodsImgUrl);
}
vo.setPurchaseBillDetailList(purchaseBillDetailDetailsVos);
List<PurchaseBillBatchDetailsVo> purchaseBillBatchDetailsVos = purchaseBillBatchService.selByMainSid(sid);
vo.setPurchaseBillBatchList(purchaseBillBatchDetailsVos);
List<PurchaseAppendixDetailsVo> purchaseAppendixDetailsVos = purchaseAppendixService.selByLinkSid(sid);
List<PurchaseAppendixUrl> purchaseAppendixUrlList = new ArrayList<>();
for (PurchaseAppendixDetailsVo purchaseAppendixDetailsVo : purchaseAppendixDetailsVos) {

2
src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmount.java
View File

@@ -69,7 +69,7 @@ public class PurchaseBillAmount extends BaseEntity {
private String currencyValue;
@ApiModelProperty("预付金额")
private BigDecimal prepayment; // 预付金额
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("付款期限")
private Date paymentTerm; // 付款期限
@ApiModelProperty("收款开户行")

5
src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountDetailsVo.java
View File

@@ -81,10 +81,9 @@ public class PurchaseBillAmountDetailsVo implements Vo {
private String currencyValue;
@ApiModelProperty("预付金额")
private BigDecimal prepayment; // 预付金额
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("付款期限")
private Date paymentTermStart; // 付款期限
private Date paymentTermEnd; // 付款期限
private Date paymentTerm;
@ApiModelProperty("收款开户行")
private String bankName; // 收款开户行
@ApiModelProperty("收款账户")

5
src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountDto.java
View File

@@ -81,10 +81,9 @@ public class PurchaseBillAmountDto implements Dto {
private String currencyValue;
@ApiModelProperty("预付金额")
private BigDecimal prepayment; // 预付金额
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("付款期限")
private Date paymentTermStart; // 付款期限
private Date paymentTermEnd; // 付款期限
private Date paymentTerm; // 付款期限
@ApiModelProperty("收款开户行")
private String bankName; // 收款开户行
@ApiModelProperty("收款账户")

4
src/main/java/com/yxt/purchase/biz/purchasebillbatch/PurchaseBillBatch.java
View File

@@ -60,10 +60,10 @@ public class PurchaseBillBatch extends BaseEntity {
private String sortNo; // 序列号
@ApiModelProperty("批次号")
private String batchNumber; // 批次号
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("生产日期")
private Date madeDate; // 生产日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("过期日期")
private Date expireDate; // 过期日期
@ApiModelProperty("货号")

10
src/main/java/com/yxt/purchase/biz/purchasebillbatch/PurchaseBillBatchDetailsVo.java
View File

@@ -61,14 +61,12 @@ public class PurchaseBillBatchDetailsVo implements Vo {
private String sortNo; // 序列号
@ApiModelProperty("批次号")
private String batchNumber; // 批次号
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("生产日期")
private Date madeDateStart; // 生产日期
private Date madeDateEnd; // 生产日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date madeDate; // 生产日期
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("过期日期")
private Date expireDateStart; // 过期日期
private Date expireDateEnd; // 过期日期
private Date expireDate; // 过期日期
@ApiModelProperty("货号")
private String goodsNum; // 货号

10
src/main/java/com/yxt/purchase/biz/purchasebillbatch/PurchaseBillBatchDto.java
View File

@@ -61,14 +61,12 @@ public class PurchaseBillBatchDto implements Dto {
private String sortNo; // 序列号
@ApiModelProperty("批次号")
private String batchNumber; // 批次号
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("生产日期")
private Date madeDateStart; // 生产日期
private Date madeDateEnd; // 生产日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date madeDate; // 生产日期
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("过期日期")
private Date expireDateStart; // 过期日期
private Date expireDateEnd; // 过期日期
private Date expireDate; // 过期日期
@ApiModelProperty("货号")
private String goodsNum; // 货号

6
src/main/java/com/yxt/purchase/biz/purchasebillbatch/PurchaseBillBatchMapper.java
View File

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -51,4 +52,9 @@ import java.util.List;
@Mapper
public interface PurchaseBillBatchMapper extends BaseMapper<PurchaseBillBatch> {
@Delete("delete from purchase_bill_batch where billSid = #{dtoSid}")
void delByMainSid(String dtoSid);
@Select("select * from purchase_bill_batch where billSid = #{billSid}")
List<PurchaseBillBatchDetailsVo> selByMainSid(String billSid);
}

10
src/main/java/com/yxt/purchase/biz/purchasebillbatch/PurchaseBillBatchService.java
View File

@@ -30,6 +30,8 @@ import com.yxt.common.base.service.MybatisBaseService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: ss-purchase(采购单) <br/>
* File: PurchaseBillBatchService.java <br/>
@@ -58,4 +60,12 @@ public class PurchaseBillBatchService extends MybatisBaseService<PurchaseBillBat
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void delByMainSid(String dtoSid) {
baseMapper.delByMainSid(dtoSid);
}
public List<PurchaseBillBatchDetailsVo> selByMainSid(String billSid) {
return baseMapper.selByMainSid(billSid);
}
}

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

@@ -40,10 +40,11 @@ import java.util.List;
@Service
public class PurchaseBillDetailService extends MybatisBaseService<PurchaseBillDetailMapper, PurchaseBillDetail> {
public void insertByDto(PurchaseBillDetailDto dto) {
public String insertByDto(PurchaseBillDetailDto dto) {
PurchaseBillDetail entity = new PurchaseBillDetail();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
return entity.getSid();
}
public void delByMainSid(String dtoSid) {