diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java index e7c9592d..c4784bfc 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java @@ -257,7 +257,7 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe // 获取增加后的库存 double refundStockNum = getStockNum(product, tbProductSku, productListDto.getNumber(), false); - setProSpecInfo(product, tbProductSku.getSpecSnap(), refundStockNum, + setProSpecInfo(product, refundStockNum, productListDto.getCostPrice(), isDistribute); break; @@ -269,7 +269,7 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe productStockDetail.setType("供应商出库"); // 获取增加后的库存 - setProSpecInfo(product, tbProductSku.getSpecSnap(), getStockNum(product, tbProductSku, productListDto.getNumber(), false), + setProSpecInfo(product, getStockNum(product, tbProductSku, productListDto.getNumber(), false), productListDto.getCostPrice(), isDistribute); break; //后台入库 @@ -282,7 +282,7 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe // 获取增加后的库存 double stockNum = getStockNum(product, tbProductSku, productListDto.getNumber(), true); - setProSpecInfo(product, tbProductSku.getSpecSnap(), stockNum, + setProSpecInfo(product, stockNum, productListDto.getCostPrice(), isDistribute); break; @@ -295,7 +295,7 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe productStockDetail.setType("其他入库"); // 获取增加后的库存 - setProSpecInfo(product, tbProductSku.getSpecSnap(), getStockNum(product, tbProductSku, productListDto.getNumber(), true), + setProSpecInfo(product, getStockNum(product, tbProductSku, productListDto.getNumber(), true), productListDto.getCostPrice(), isDistribute); break; case "other-out": @@ -307,7 +307,7 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe productStockDetail.setType("其他出库"); // 获取增加后的库存 - setProSpecInfo(product, tbProductSku.getSpecSnap(), getStockNum(product, tbProductSku, productListDto.getNumber(), false), + setProSpecInfo(product, getStockNum(product, tbProductSku, productListDto.getNumber(), false), productListDto.getCostPrice(), isDistribute); break; default: @@ -344,7 +344,7 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe } } - private void setProSpecInfo(TbProduct product, String specSnap, double num, BigDecimal cost, boolean isShareStock) { + private void setProSpecInfo(TbProduct product, double num, BigDecimal cost, boolean isShareStock) { if (product.getSpecInfo() != null) { JSONArray specInfoArr = JSON.parseArray(product.getSpecInfo()); for (Object item : specInfoArr) { @@ -352,7 +352,7 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe if (isShareStock) { jsonObject.put("stockNumber", num); jsonObject.put("costPrice", cost); - }else if (specSnap.equals(jsonObject.getString("specSnap"))) { + }else if (product.getSpecInfo() != null && product.getSpecInfo().equals(jsonObject.getString("specSnap"))) { jsonObject.put("stockNumber", num); jsonObject.put("costPrice", cost); break;