czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

上下架 报错问题

This commit is contained in:
wangw 2024-09-24 15:14:36 +08:00
parent 6300940d2e
commit 6b15377285
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
View File

@ -206,11 +206,8 @@ public class StockServiceImpl implements StockService {
TbProductStockDetail stockDetail = new TbProductStockDetail(); TbProductStockDetail stockDetail = new TbProductStockDetail();
stockDetail.setCreatedAt(System.currentTimeMillis()); stockDetail.setCreatedAt(System.currentTimeMillis());
stockDetail.setUpdatedAt(System.currentTimeMillis()); stockDetail.setUpdatedAt(System.currentTimeMillis());
stockDetail.setSourcePath("NORMAL"); stockDetail.setSourcePath("SHOP");
stockDetail.setType("一次性入库覆盖库存");
stockDetail.setSubType(1);
stockDetail.setRemark("一次性入库覆盖库存"); stockDetail.setRemark("一次性入库覆盖库存");
if ("sku".equals(productIdStr)) { if ("sku".equals(productIdStr)) {
Optional<TbProductSku> byId = skuRepository.findById(Double.valueOf(row.getCell(2).toString()).intValue()); Optional<TbProductSku> byId = skuRepository.findById(Double.valueOf(row.getCell(2).toString()).intValue());
if (byId.isPresent()) { if (byId.isPresent()) {
@ -230,8 +227,17 @@ public class StockServiceImpl implements StockService {
stockDetail.setProductId(product.getId().toString()); stockDetail.setProductId(product.getId().toString());
stockDetail.setProductName(product.getName()); stockDetail.setProductName(product.getName());
stockDetail.setUnitName(shopUnit.getName()); stockDetail.setUnitName(shopUnit.getName());
stockDetail.setLeftNumber(0); stockDetail.setLeftNumber(product.getStockNumber());//原库存
stockDetail.setStockNumber(aDouble); BigDecimal subtract = new BigDecimal(aDouble).subtract(new BigDecimal(product.getStockNumber()));
if (subtract.compareTo(BigDecimal.ZERO) > 0) {
stockDetail.setSubType(1);
stockDetail.setType("盘点入库");
stockDetail.setStockNumber(subtract.doubleValue());
}else {
stockDetail.setSubType(-1);
stockDetail.setType("盘点出库");
stockDetail.setStockNumber(subtract.doubleValue());
}
stockDetails.add(stockDetail); stockDetails.add(stockDetail);
list.add(new StockV2Vo( list.add(new StockV2Vo(
@ -261,8 +267,19 @@ public class StockServiceImpl implements StockService {
stockDetail.setProductId(product.getId().toString()); stockDetail.setProductId(product.getId().toString());
stockDetail.setProductName(product.getName()); stockDetail.setProductName(product.getName());
stockDetail.setUnitName(shopUnit.getName()); stockDetail.setUnitName(shopUnit.getName());
stockDetail.setLeftNumber(0); // stockDetail.setLeftNumber(0);
stockDetail.setStockNumber(aDouble); // stockDetail.setStockNumber(aDouble);
stockDetail.setLeftNumber(product.getStockNumber());//原库存
BigDecimal subtract = new BigDecimal(aDouble).subtract(new BigDecimal(product.getStockNumber()));
if (subtract.compareTo(BigDecimal.ZERO) > 0) {
stockDetail.setSubType(1);
stockDetail.setType("盘点入库");
stockDetail.setStockNumber(subtract.doubleValue());
}else {
stockDetail.setSubType(-1);
stockDetail.setType("盘点出库");
stockDetail.setStockNumber(subtract.doubleValue());
}
stockDetails.add(stockDetail); stockDetails.add(stockDetail);
list.add(new StockV2Vo( list.add(new StockV2Vo(
@ -338,12 +355,12 @@ public class StockServiceImpl implements StockService {
TbProduct product = new TbProduct(); TbProduct product = new TbProduct();
for (StockUpdateValueVO updateValueVO : updateValueVOs) { for (StockUpdateValueVO updateValueVO : updateValueVOs) {
if (!updateValueVO.isSku()) { if (!updateValueVO.isSku()) {
if (product == null) { if (product.getId()!=null) {
product = tbProductRepository.getById(Integer.valueOf(updateValueVO.getId())); product = tbProductRepository.getById(Integer.valueOf(updateValueVO.getId()));
} }
productUp(updateValueVO, product); productUp(updateValueVO, product);
} else { } else {
if (product == null) { if (product.getId()!=null) {
product = tbProductRepository.selectBySkuId(Integer.valueOf(updateValueVO.getId())); product = tbProductRepository.selectBySkuId(Integer.valueOf(updateValueVO.getId()));
} }
productSkuUp(updateValueVO, product); productSkuUp(updateValueVO, product);