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

采购单附件调整

Browse Source
This commit is contained in:
God
2024-08-07 10:26:23 +08:00
parent ad87b35208
commit 8dd7ea772e
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
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; private PurchaseAppendixService purchaseAppendixService;
@Autowired @Autowired
private PurchaseFlowNodeService purchaseFlowNodeService; private PurchaseFlowNodeService purchaseFlowNodeService;
@Autowired
private FileUploadComponent fileUploadComponent;
public ResultBean<PagerVo<PurchaseBillVo>> listPageVo(PagerQuery<PurchaseBillQuery> pq) { public ResultBean<PagerVo<PurchaseBillVo>> listPageVo(PagerQuery<PurchaseBillQuery> pq) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
@@ -247,9 +245,6 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
//保存商品信息 //保存商品信息
for (PurchaseBillDetailDto purchaseBillDetailDto : purchaseBillDetailList) { for (PurchaseBillDetailDto purchaseBillDetailDto : purchaseBillDetailList) {
purchaseBillDetailDto.setBillSid(sid); purchaseBillDetailDto.setBillSid(sid);
String goodsImgUrl = purchaseBillDetailDto.getGoodsImgUrl();
goodsImgUrl = goodsImgUrl.replace(fileUploadComponent.getUrlPrefix(), "");
purchaseBillDetailDto.setGoodsImgUrl(goodsImgUrl);
String detailSid = purchaseBillDetailService.insertByDto(purchaseBillDetailDto); String detailSid = purchaseBillDetailService.insertByDto(purchaseBillDetailDto);
PurchaseBillBatchDto purchaseBillBatchDto = new PurchaseBillBatchDto(); PurchaseBillBatchDto purchaseBillBatchDto = new PurchaseBillBatchDto();
purchaseBillBatchDto.setBillSid(sid); purchaseBillBatchDto.setBillSid(sid);
@@ -262,10 +257,9 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
//保存附件信息 //保存附件信息
for (PurchaseAppendixUrl purchaseAppendixUrl : purchaseAppendixList) { for (PurchaseAppendixUrl purchaseAppendixUrl : purchaseAppendixList) {
PurchaseAppendixDto purchaseAppendixDto = new PurchaseAppendixDto(); PurchaseAppendixDto purchaseAppendixDto = new PurchaseAppendixDto();
String filePath = purchaseAppendixUrl.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
purchaseAppendixDto.setLinkSid(sid); purchaseAppendixDto.setLinkSid(sid);
purchaseAppendixDto.setAttachType(PurchaseFileEnum.PURCHASEBILL.getAttachType()); purchaseAppendixDto.setAttachType(PurchaseFileEnum.PURCHASEBILL.getAttachType());
purchaseAppendixDto.setFilePath(filePath); purchaseAppendixDto.setFilePath(purchaseAppendixUrl.getUrl());
purchaseAppendixService.insertByDto(purchaseAppendixDto); purchaseAppendixService.insertByDto(purchaseAppendixDto);
} }
//保存操作日志 //保存操作日志
@@ -293,9 +287,6 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
//保存商品信息 //保存商品信息
for (PurchaseBillDetailDto purchaseBillDetailDto : purchaseBillDetailList) { for (PurchaseBillDetailDto purchaseBillDetailDto : purchaseBillDetailList) {
purchaseBillDetailDto.setBillSid(dtoSid); purchaseBillDetailDto.setBillSid(dtoSid);
String goodsImgUrl = purchaseBillDetailDto.getGoodsImgUrl();
goodsImgUrl = goodsImgUrl.replace(fileUploadComponent.getUrlPrefix(), "");
purchaseBillDetailDto.setGoodsImgUrl(goodsImgUrl);
String detailSid = purchaseBillDetailService.insertByDto(purchaseBillDetailDto); String detailSid = purchaseBillDetailService.insertByDto(purchaseBillDetailDto);
PurchaseBillBatchDto purchaseBillBatchDto = new PurchaseBillBatchDto(); PurchaseBillBatchDto purchaseBillBatchDto = new PurchaseBillBatchDto();
purchaseBillBatchDto.setBillSid(dtoSid); purchaseBillBatchDto.setBillSid(dtoSid);
@@ -308,10 +299,9 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
//保存附件信息 //保存附件信息
for (PurchaseAppendixUrl purchaseAppendixUrl : purchaseAppendixList) { for (PurchaseAppendixUrl purchaseAppendixUrl : purchaseAppendixList) {
PurchaseAppendixDto purchaseAppendixDto = new PurchaseAppendixDto(); PurchaseAppendixDto purchaseAppendixDto = new PurchaseAppendixDto();
String filePath = purchaseAppendixUrl.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
purchaseAppendixDto.setLinkSid(dtoSid); purchaseAppendixDto.setLinkSid(dtoSid);
purchaseAppendixDto.setAttachType(PurchaseFileEnum.PURCHASEBILL.getAttachType()); purchaseAppendixDto.setAttachType(PurchaseFileEnum.PURCHASEBILL.getAttachType());
purchaseAppendixDto.setFilePath(filePath); purchaseAppendixDto.setFilePath(purchaseAppendixUrl.getUrl());
purchaseAppendixService.insertByDto(purchaseAppendixDto); purchaseAppendixService.insertByDto(purchaseAppendixDto);
} }
return dtoSid; return dtoSid;
@@ -363,9 +353,6 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
for (PurchaseBillDetailDetailsVo purchaseBillDetailDetailsVo : purchaseBillDetailDetailsVos) { for (PurchaseBillDetailDetailsVo purchaseBillDetailDetailsVo : purchaseBillDetailDetailsVos) {
purchaseBillDetailDetailsVo.setCost1(purchaseBillDetailDetailsVo.getCost()); purchaseBillDetailDetailsVo.setCost1(purchaseBillDetailDetailsVo.getCost());
purchaseBillDetailDetailsVo.setCount1(purchaseBillDetailDetailsVo.getCount()); purchaseBillDetailDetailsVo.setCount1(purchaseBillDetailDetailsVo.getCount());
String goodsImgUrl = purchaseBillDetailDetailsVo.getGoodsImgUrl();
goodsImgUrl = fileUploadComponent.getUrlPrefix() + goodsImgUrl;
purchaseBillDetailDetailsVo.setGoodsImgUrl(goodsImgUrl);
for (PurchaseBillBatchDetailsVo purchaseBillBatchDetailsVo : purchaseBillBatchDetailsVos) { for (PurchaseBillBatchDetailsVo purchaseBillBatchDetailsVo : purchaseBillBatchDetailsVos) {
purchaseBillDetailDetailsVo.setBatchNumber(purchaseBillBatchDetailsVo.getBatchNumber()); purchaseBillDetailDetailsVo.setBatchNumber(purchaseBillBatchDetailsVo.getBatchNumber());
purchaseBillDetailDetailsVo.setExpireDate(purchaseBillBatchDetailsVo.getExpireDate()); purchaseBillDetailDetailsVo.setExpireDate(purchaseBillBatchDetailsVo.getExpireDate());
@@ -377,8 +364,7 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
List<PurchaseAppendixUrl> purchaseAppendixUrlList = new ArrayList<>(); List<PurchaseAppendixUrl> purchaseAppendixUrlList = new ArrayList<>();
for (PurchaseAppendixDetailsVo purchaseAppendixDetailsVo : purchaseAppendixDetailsVos) { for (PurchaseAppendixDetailsVo purchaseAppendixDetailsVo : purchaseAppendixDetailsVos) {
PurchaseAppendixUrl purchaseAppendixUrl = new PurchaseAppendixUrl(); PurchaseAppendixUrl purchaseAppendixUrl = new PurchaseAppendixUrl();
String url = fileUploadComponent.getUrlPrefix() + purchaseAppendixDetailsVo.getFilePath(); purchaseAppendixUrl.setUrl(purchaseAppendixDetailsVo.getFilePath());
purchaseAppendixUrl.setUrl(url);
purchaseAppendixUrlList.add(purchaseAppendixUrl); purchaseAppendixUrlList.add(purchaseAppendixUrl);
} }
vo.setPurchaseAppendixList(purchaseAppendixUrlList); vo.setPurchaseAppendixList(purchaseAppendixUrlList);