采购单附件调整
This commit is contained in:
@@ -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();
|
||||
@@ -247,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);
|
||||
@@ -262,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);
|
||||
}
|
||||
//保存操作日志
|
||||
@@ -293,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);
|
||||
@@ -308,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;
|
||||
@@ -363,9 +353,6 @@ 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);
|
||||
for (PurchaseBillBatchDetailsVo purchaseBillBatchDetailsVo : purchaseBillBatchDetailsVos) {
|
||||
purchaseBillDetailDetailsVo.setBatchNumber(purchaseBillBatchDetailsVo.getBatchNumber());
|
||||
purchaseBillDetailDetailsVo.setExpireDate(purchaseBillBatchDetailsVo.getExpireDate());
|
||||
@@ -377,8 +364,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);
|
||||
|
||||
Reference in New Issue
Block a user