2023年12月5日16:32:19

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -711,11 +711,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 						throw new RuntimeException(goodsDesc.getCname() + "已开启批次号管理,请填写批次号");
 					}
 					if (finalPjStockDescList.size() > 0) {
-						stockOne = finalPjStockDescList.stream().filter(i -> i.getDot() != null && i.getDot().equals(e.getDot())).findFirst().orElse(null);
+						stockOne = finalPjStockDescList.stream().filter(i -> i.getGoodsId().equals(goodsDesc.getId()) && ObjectUtils.isNotNull(i.getDot()) && i.getDot().equals(e.getDot())).findFirst().orElse(null);
 					}
 				} else {
 					if (finalPjStockDescList.size() > 0) {
-						stockOne = finalPjStockDescList.stream().filter(i -> "".equals(i.getDot()) || i.getDot() == null).findFirst().orElse(null);
+						stockOne = finalPjStockDescList.stream().filter(i -> i.getGoodsId().equals(goodsDesc.getId()) && "".equals(i.getDot()) || i.getDot() == null).findFirst().orElse(null);
 					}
 				}
 				if (ObjectUtil.isEmpty(stockOne)) {