Browse Source

中心仓查看库存明细接口优化

liyuan 3 months ago
parent
commit
35a3b0ea4a

+ 1 - 1
blade-service/tire-center-warehouse/src/main/java/com/ecp/tire/center/warehouse/plan/impl/CenterOrderPlanServiceImpl.java

@@ -564,7 +564,7 @@ public class CenterOrderPlanServiceImpl extends ServiceImpl<CenterOrderPlanMappe
 			CenterStockDesc desc = centerStockDescList.stream().filter(item -> item.getPlanId().equals(planId) && item.getGoodsId().equals(goodsId)
 			CenterStockDesc desc = centerStockDescList.stream().filter(item -> item.getPlanId().equals(planId) && item.getGoodsId().equals(goodsId)
 				&& item.getDot().equals(dot) && item.getRegionId().equals(regionId)).findFirst().orElse(null);
 				&& item.getDot().equals(dot) && item.getRegionId().equals(regionId)).findFirst().orElse(null);
 			if (Objects.isNull(desc)) {
 			if (Objects.isNull(desc)) {
-				throw new RuntimeException("缺少库存数据,请联系管理员");
+				throw new NullPointerException("缺少库存数据,请联系管理员");
 			}
 			}
 			BigDecimal sum = mapData.getValue().stream().map(CenterOrderPlanItem::getGoodsNum).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 			BigDecimal sum = mapData.getValue().stream().map(CenterOrderPlanItem::getGoodsNum).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 			insertOrUpdateList.add(desc);
 			insertOrUpdateList.add(desc);

+ 1 - 0
blade-service/tire-center-warehouse/src/main/java/com/ecp/tire/center/warehouse/stock/mapper/CenterStockDescMapper.xml

@@ -77,6 +77,7 @@
           and col.customer_id = #{customerId}
           and col.customer_id = #{customerId}
         and copi.is_deleted = 0
         and copi.is_deleted = 0
         and col.is_deleted = 0
         and col.is_deleted = 0
+          and col.status = 1
         and (col.id = #{planId} or copi.bill_id = #{planId})
         and (col.id = #{planId} or copi.bill_id = #{planId})
         ORDER BY copi.update_time desc
         ORDER BY copi.update_time desc
     </select>
     </select>