clunt
/
erp-console
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

返回图片

This commit is contained in:
kuang.yife 2024-09-23 14:57:41 +08:00
parent 5983990437
commit d333f11d34
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/domain/src/main/java/com/wansenai/bo/ShipmentsDataBO.java
View File

@ -45,6 +45,8 @@ public class ShipmentsDataBO {
private String productModel; private String productModel;
private String imageUrl;
private String productColor; private String productColor;
private Integer stock; private Integer stock;

18
core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptRetailServiceImpl.java
View File

@ -28,6 +28,7 @@ import com.wansenai.dto.receipt.retail.RetailRefundDTO;
import com.wansenai.dto.receipt.retail.RetailShipmentsDTO; import com.wansenai.dto.receipt.retail.RetailShipmentsDTO;
import com.wansenai.dto.system.SystemMessageDTO; import com.wansenai.dto.system.SystemMessageDTO;
import com.wansenai.entities.financial.FinancialAccount; import com.wansenai.entities.financial.FinancialAccount;
import com.wansenai.entities.product.ProductImage;
import com.wansenai.entities.product.ProductStock; import com.wansenai.entities.product.ProductStock;
import com.wansenai.entities.product.ProductStockKeepUnit; import com.wansenai.entities.product.ProductStockKeepUnit;
import com.wansenai.entities.receipt.ReceiptRetailMain; import com.wansenai.entities.receipt.ReceiptRetailMain;
@ -40,6 +41,7 @@ import com.wansenai.mappers.receipt.ReceiptRetailMainMapper;
import com.wansenai.mappers.system.SysFileMapper; import com.wansenai.mappers.system.SysFileMapper;
import com.wansenai.service.common.CommonService; import com.wansenai.service.common.CommonService;
import com.wansenai.service.financial.IFinancialAccountService; import com.wansenai.service.financial.IFinancialAccountService;
import com.wansenai.service.product.ProductImageService;
import com.wansenai.service.product.ProductService; import com.wansenai.service.product.ProductService;
import com.wansenai.service.receipt.ReceiptRetailService; import com.wansenai.service.receipt.ReceiptRetailService;
import com.wansenai.service.receipt.ReceiptRetailSubService; import com.wansenai.service.receipt.ReceiptRetailSubService;
@ -62,6 +64,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.io.IOException; import java.io.IOException;
@ -97,7 +100,13 @@ public class ReceiptRetailServiceImpl extends ServiceImpl<ReceiptRetailMainMappe
private final RedisUtil redisUtil; private final RedisUtil redisUtil;
public ReceiptRetailServiceImpl(ReceiptRetailMainMapper receiptRetailMainMapper, ReceiptRetailSubService receiptRetailSubService, IFinancialAccountService accountService, ISysUserService userService, SysFileMapper fileMapper, ProductStockMapper productStockMapper, ProductStockKeepUnitMapper productStockKeepUnitMapper, ProductService productService, CommonService commonService, ISysMsgService messageService, RedisUtil redisUtil) { private final ProductImageService productImageService;
public ReceiptRetailServiceImpl(ReceiptRetailMainMapper receiptRetailMainMapper, ReceiptRetailSubService receiptRetailSubService,
IFinancialAccountService accountService, ISysUserService userService, SysFileMapper fileMapper,
ProductStockMapper productStockMapper, ProductStockKeepUnitMapper productStockKeepUnitMapper,
ProductService productService, CommonService commonService, ISysMsgService messageService, RedisUtil redisUtil,
ProductImageService productImageService) {
this.receiptRetailMainMapper = receiptRetailMainMapper; this.receiptRetailMainMapper = receiptRetailMainMapper;
this.receiptRetailSubService = receiptRetailSubService; this.receiptRetailSubService = receiptRetailSubService;
this.accountService = accountService; this.accountService = accountService;
@ -109,6 +118,7 @@ public class ReceiptRetailServiceImpl extends ServiceImpl<ReceiptRetailMainMappe
this.commonService = commonService; this.commonService = commonService;
this.messageService = messageService; this.messageService = messageService;
this.redisUtil = redisUtil; this.redisUtil = redisUtil;
this.productImageService = productImageService;
} }
private String getAccountName(Long accountId) { private String getAccountName(Long accountId) {
@ -216,6 +226,8 @@ public class ReceiptRetailServiceImpl extends ServiceImpl<ReceiptRetailMainMappe
.warehouseId(item.getWarehouseId()) .warehouseId(item.getWarehouseId())
.build(); .build();
var data = productStockMapper.getProductSkuByBarCode(item.getProductBarcode(), item.getWarehouseId()); var data = productStockMapper.getProductSkuByBarCode(item.getProductBarcode(), item.getWarehouseId());
var img = productImageService.lambdaQuery().select(ProductImage::getImageUrl)
.eq(ProductImage::getProductId, item.getProductId()).list();
if (data != null) { if (data != null) {
shipmentBo.setWarehouseId(data.getWarehouseId()); shipmentBo.setWarehouseId(data.getWarehouseId());
shipmentBo.setProductName(data.getProductName()); shipmentBo.setProductName(data.getProductName());
@ -228,6 +240,10 @@ public class ReceiptRetailServiceImpl extends ServiceImpl<ReceiptRetailMainMappe
if (data.getWarehouseId() != null) { if (data.getWarehouseId() != null) {
shipmentBo.setWarehouseName(commonService.getWarehouseName(data.getWarehouseId())); shipmentBo.setWarehouseName(commonService.getWarehouseName(data.getWarehouseId()));
} }
if(!CollectionUtils.isEmpty(img)){
shipmentBo.setImageUrl(img.get(0).getImageUrl());
}
} }
return shipmentBo; return shipmentBo;
} }