上下架 报错问题
This commit is contained in:
parent
1e09c75ea0
commit
5b6e8caf35
|
|
@ -206,11 +206,8 @@ public class StockServiceImpl implements StockService {
|
|||
TbProductStockDetail stockDetail = new TbProductStockDetail();
|
||||
stockDetail.setCreatedAt(System.currentTimeMillis());
|
||||
stockDetail.setUpdatedAt(System.currentTimeMillis());
|
||||
stockDetail.setSourcePath("NORMAL");
|
||||
stockDetail.setType("一次性入库覆盖库存");
|
||||
stockDetail.setSubType(1);
|
||||
stockDetail.setSourcePath("SHOP");
|
||||
stockDetail.setRemark("一次性入库覆盖库存");
|
||||
|
||||
if ("sku".equals(productIdStr)) {
|
||||
Optional<TbProductSku> byId = skuRepository.findById(Double.valueOf(row.getCell(2).toString()).intValue());
|
||||
if (byId.isPresent()) {
|
||||
|
|
@ -230,8 +227,17 @@ public class StockServiceImpl implements StockService {
|
|||
stockDetail.setProductId(product.getId().toString());
|
||||
stockDetail.setProductName(product.getName());
|
||||
stockDetail.setUnitName(shopUnit.getName());
|
||||
stockDetail.setLeftNumber(0);
|
||||
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);
|
||||
|
||||
list.add(new StockV2Vo(
|
||||
|
|
@ -261,8 +267,19 @@ public class StockServiceImpl implements StockService {
|
|||
stockDetail.setProductId(product.getId().toString());
|
||||
stockDetail.setProductName(product.getName());
|
||||
stockDetail.setUnitName(shopUnit.getName());
|
||||
stockDetail.setLeftNumber(0);
|
||||
stockDetail.setStockNumber(aDouble);
|
||||
// stockDetail.setLeftNumber(0);
|
||||
// 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);
|
||||
|
||||
list.add(new StockV2Vo(
|
||||
|
|
@ -338,12 +355,12 @@ public class StockServiceImpl implements StockService {
|
|||
TbProduct product = new TbProduct();
|
||||
for (StockUpdateValueVO updateValueVO : updateValueVOs) {
|
||||
if (!updateValueVO.isSku()) {
|
||||
if (product == null) {
|
||||
if (product.getId()!=null) {
|
||||
product = tbProductRepository.getById(Integer.valueOf(updateValueVO.getId()));
|
||||
}
|
||||
productUp(updateValueVO, product);
|
||||
} else {
|
||||
if (product == null) {
|
||||
if (product.getId()!=null) {
|
||||
product = tbProductRepository.selectBySkuId(Integer.valueOf(updateValueVO.getId()));
|
||||
}
|
||||
productSkuUp(updateValueVO, product);
|
||||
|
|
|
|||
Loading…
Reference in New Issue