BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：库存盘点获取颜色尺码库存接口调整；

pull/1121/head
liujiang 2025-09-19 21:42:42 +08:00
parent a36f3e27bd
commit e31f0c025a
6 changed files with 158 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java
View File

@ -90,9 +90,9 @@ public class StoreProductStockController extends XktBaseController {
}
@ApiOperation(value = "根据货号查询档口商品库存", httpMethod = "GET", response = R.class)
@GetMapping(value = "/{storeId}/prod-art-num/{prodArtNum}")
public R<List<StoreProdStockResVO>> getByStoreIdAndProdArtNum(@PathVariable("storeId") Long storeId, @PathVariable("prodArtNum") String prodArtNum) {
return R.ok(BeanUtil.copyToList(storeProdStockService.selectByStoreIdAndProdArtNum(storeId, prodArtNum), StoreProdStockResVO.class));
@GetMapping(value = "/{storeId}/store-prod-id/{storeProdId}")
public R<StoreProdStockTakeResVO> getByStoreIdAndStoreProdId(@PathVariable("storeId") Long storeId, @PathVariable("storeProdId") Long storeProdId) {
return R.ok(BeanUtil.toBean(storeProdStockService.getByStoreIdAndStoreProdId(storeId, storeProdId), StoreProdStockTakeResVO.class));
}
@PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')||@ss.hasSupplierSubRole()")

50
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockTakeResVO.java 100644
View File

@ -0,0 +1,50 @@
package com.ruoyi.web.controller.xkt.vo.storeProdStock;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List;
/**
* @author liujiang
* @version v1.0
* @date 2025/3/27 15:12
*/
@Data
@Accessors(chain = true)
public class StoreProdStockTakeResVO {
@ApiModelProperty(value = "档口商品ID")
private Long storeProdId;
@ApiModelProperty(value = "商品货号")
private String prodArtNum;
@ApiModelProperty(value = "颜色列表")
private List<SPSTColorSizeVO> colorList;
@Data
@ApiModel
@Accessors(chain = true)
public static class SPSTColorSizeVO {
@ApiModelProperty(value = "颜色ID")
private Long storeColorId;
@ApiModelProperty(value = "颜色名称")
private String colorName;
@ApiModelProperty(value = "尺码库存列表")
List<SPSTSizeStockVO> sizeStockList;
}
@Data
@ApiModel
@Accessors(chain = true)
public static class SPSTSizeStockVO {
@ApiModelProperty(value = "档口商品颜色尺码ID")
private Long storeProdColorSizeId;
@ApiModelProperty(value = "尺码尺码")
private Integer size;
@ApiModelProperty(value = "盘点库存")
private Integer stock;
}
}

50
xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockTakeResDTO.java 100644
View File

@ -0,0 +1,50 @@
package com.ruoyi.xkt.dto.storeProductStock;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List;
/**
* @author liujiang
* @version v1.0
* @date 2025/3/27 15:12
*/
@Data
@Accessors(chain = true)
public class StoreProdStockTakeResDTO {
@ApiModelProperty(value = "档口商品ID")
private Long storeProdId;
@ApiModelProperty(value = "商品货号")
private String prodArtNum;
@ApiModelProperty(value = "颜色列表")
private List<SPSTColorSizeDTO> colorList;
@Data
@ApiModel
@Accessors(chain = true)
public static class SPSTColorSizeDTO {
@ApiModelProperty(value = "颜色ID")
private Long storeColorId;
@ApiModelProperty(value = "颜色名称")
private String colorName;
@ApiModelProperty(value = "尺码库存列表")
List<SPSTSizeStockDTO> sizeStockList;
}
@Data
@ApiModel
@Accessors(chain = true)
public static class SPSTSizeStockDTO {
@ApiModelProperty(value = "档口商品颜色尺码ID")
private Long storeProdColorSizeId;
@ApiModelProperty(value = "尺码尺码")
private Integer size;
@ApiModelProperty(value = "盘点库存")
private Integer stock;
}
}

4
xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductStockService.java
View File

@ -69,10 +69,10 @@ public interface IStoreProductStockService {
* 根据档口ID和商品货号查询档口商品库存
*
* @param storeId 档口ID
* @param prodArtNum 商品货号
* @param storeProdId 档口商品ID
* @return String
*/
List<StoreProdStockResDTO> selectByStoreIdAndProdArtNum(Long storeId, String prodArtNum);
StoreProdStockTakeResDTO getByStoreIdAndStoreProdId(Long storeId, Long storeProdId);
/**
* 销售出库，输入货号，查询客户优惠信息及当前货号颜色的库存

7
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java
View File

@ -634,7 +634,12 @@ public class StoreProductDemandServiceImpl implements IStoreProductDemandService
.eq(StoreProductDemandDetail::getDelFlag, Constants.UNDELETED).eq(StoreProductDemandDetail::getStoreId, finishAllDTO.getStoreId())
.in(StoreProductDemandDetail::getId, finishAllDTO.getStoreProdDemandDetailIdList()));
if (CollectionUtils.isEmpty(demandDetailList)) {
throw new ServiceException("没有找到任何需求单!", HttpStatus.ERROR);
throw new ServiceException("生产需求单不存在!", HttpStatus.ERROR);
}
// 如果生产需求单本来就是：已完成 状态，则不可再完成
if (demandDetailList.stream().anyMatch(x -> Objects.equals(x.getDetailStatus(), DemandStatus.PRODUCTION_COMPLETE.getValue()))) {
throw new ServiceException(demandDetailList.stream().map(StoreProductDemandDetail::getProdArtNum).collect(Collectors.toList())
+ " 等生产需求单已处于已完成状态!", HttpStatus.ERROR);
}
// 调整状态为已完成
demandDetailList.forEach(demandDetail -> demandDetail.setDetailStatus(DemandStatus.PRODUCTION_COMPLETE.getValue()));

68
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStockServiceImpl.java
View File

@ -9,6 +9,8 @@ import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.page.Page;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.xkt.domain.StoreColor;
import com.ruoyi.xkt.domain.StoreProduct;
import com.ruoyi.xkt.domain.StoreProductColorSize;
import com.ruoyi.xkt.domain.StoreProductStock;
import com.ruoyi.xkt.dto.storeProductFile.StoreProdMainPicDTO;
@ -46,6 +48,7 @@ public class StoreProductStockServiceImpl implements IStoreProductStockService {
final StoreCustomerProductDiscountMapper storeCusProdDiscMapper;
final StoreProductMapper storeProdMapper;
final StoreProductColorSizeMapper prodColorSizeMapper;
final StoreColorMapper storeColorMapper;
/**
@ -116,18 +119,41 @@ public class StoreProductStockServiceImpl implements IStoreProductStockService {
/**
* 根据档口ID和商品货号查询档口商品库存
*
* @param storeId 档口ID
* @param prodArtNum 商品货号
* @return String
* @param storeId 档口ID
* @param storeProdId 商品ID
* @return StoreProdStockTakeResDTO
*/
@Override
@Transactional(readOnly = true)
public List<StoreProdStockResDTO> selectByStoreIdAndProdArtNum(Long storeId, String prodArtNum) {
public StoreProdStockTakeResDTO getByStoreIdAndStoreProdId(Long storeId, Long storeProdId) {
StoreProduct storeProd = Optional.ofNullable(this.storeProdMapper.selectById(storeProdId)).orElseThrow(() -> new ServiceException("该商品不存在", HttpStatus.ERROR));
// 查询该商品所有颜色的库存
List<StoreProductStock> stockList = this.storeProdStockMapper.selectList(new LambdaQueryWrapper<StoreProductStock>()
.eq(StoreProductStock::getStoreId, storeId).eq(StoreProductStock::getProdArtNum, prodArtNum)
.eq(StoreProductStock::getStoreId, storeId).eq(StoreProductStock::getStoreProdId, storeProdId)
.eq(StoreProductStock::getDelFlag, Constants.UNDELETED));
return CollectionUtils.isEmpty(stockList) ? new ArrayList<>()
: stockList.stream().map(x -> BeanUtil.toBean(x, StoreProdStockResDTO.class).setStoreProdStockId(x.getId())).collect(Collectors.toList());
// 商品颜色对应的库存map
Map<Long, StoreProductStock> colorSizeStockMap = stockList.stream().collect(Collectors.toMap(StoreProductStock::getStoreColorId, x -> x));
// 档口商品颜色map
List<StoreColor> storeColorList = this.storeColorMapper.selectList(new LambdaQueryWrapper<StoreColor>()
.eq(StoreColor::getDelFlag, Constants.UNDELETED).eq(StoreColor::getStoreId, storeId));
Map<Long, StoreColor> storeColorMap = storeColorList.stream().collect(Collectors.toMap(StoreColor::getId, x -> x));
// 获取商品所有颜色的基础信息
List<StoreProductColorSize> prodColorSizeList = this.prodColorSizeMapper.selectList(new LambdaQueryWrapper<StoreProductColorSize>()
.eq(StoreProductColorSize::getDelFlag, Constants.UNDELETED).eq(StoreProductColorSize::getStoreProdId, storeProdId));
Map<Long, List<StoreProductColorSize>> colorSizeMap = prodColorSizeList.stream().collect(Collectors.groupingBy(StoreProductColorSize::getStoreColorId));
List<StoreProdStockTakeResDTO.SPSTColorSizeDTO> colorResList = new ArrayList<>();
colorSizeMap.forEach((colorId, colorSizeList) -> {
// 商品颜色数据
StoreProdStockTakeResDTO.SPSTColorSizeDTO color = new StoreProdStockTakeResDTO.SPSTColorSizeDTO()
.setStoreColorId(colorId).setColorName(storeColorMap.containsKey(colorId) ? storeColorMap.get(colorId).getColorName() : "")
// 商品对应颜色的库存
.setSizeStockList(colorSizeList.stream().sorted(Comparator.comparing(StoreProductColorSize::getSize))
.map(x -> new StoreProdStockTakeResDTO.SPSTSizeStockDTO().setStoreProdColorSizeId(x.getId()).setSize(x.getSize())
.setStock(this.getSizeStock(x.getSize(), colorSizeStockMap.get(colorId))))
.collect(Collectors.toList()));
colorResList.add(color);
});
return new StoreProdStockTakeResDTO().setStoreProdId(storeProdId).setProdArtNum(storeProd.getProdArtNum()).setColorList(colorResList);
}
/**
@ -516,33 +542,33 @@ public class StoreProductStockServiceImpl implements IStoreProductStockService {
if (ObjectUtils.isEmpty(stock)) {
return null;
}
if (size == 30) {
if (Objects.equals(size, SIZE_30)) {
return stock.getSize30();
} else if (size == 31) {
} else if (Objects.equals(size, SIZE_31)) {
return stock.getSize31();
} else if (size == 32) {
} else if (Objects.equals(size, SIZE_32)) {
return stock.getSize32();
} else if (size == 33) {
} else if (Objects.equals(size, SIZE_33)) {
return stock.getSize33();
} else if (size == 34) {
} else if (Objects.equals(size, SIZE_34)) {
return stock.getSize34();
} else if (size == 35) {
} else if (Objects.equals(size, SIZE_35)) {
return stock.getSize35();
} else if (size == 36) {
} else if (Objects.equals(size, SIZE_36)) {
return stock.getSize36();
} else if (size == 37) {
} else if (Objects.equals(size, SIZE_37)) {
return stock.getSize37();
} else if (size == 38) {
} else if (Objects.equals(size, SIZE_38)) {
return stock.getSize38();
} else if (size == 39) {
} else if (Objects.equals(size, SIZE_39)) {
return stock.getSize39();
} else if (size == 40) {
} else if (Objects.equals(size, SIZE_40)) {
return stock.getSize40();
} else if (size == 41) {
} else if (Objects.equals(size, SIZE_41)) {
return stock.getSize41();
} else if (size == 42) {
} else if (Objects.equals(size, SIZE_42)) {
return stock.getSize42();
} else if (size == 43) {
} else if (Objects.equals(size, SIZE_43)) {
return stock.getSize43();
}
return null;