库存管理 问题处理

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -152,8 +152,12 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         int purchaseArrival = StockWaitType.PURCHASE_ARRIVAL_IN.getDetailType().equals(stockWait.getBusinessType()) ? 1 : 0;
         //获取采购单价（只有采购到货才有）
         PurchaseDetailPo purchaseDetail = baseMapper.getPurchaseDetail(IWrapper.getWrapper().eq("swd.id", stockWaitDetails.getId()));
+        BigDecimal purchasePrice = null;
+        if(ObjectUtil.isNotEmpty(purchaseDetail)){
+            purchasePrice = purchaseDetail.getPrice();
+        }
         //计算结存单价
-        StockJournalDetails stockJournalDetails = calculateUnitPrice(stockJournalType.getType(), productId, warehouseId, inOutQuantity, purchaseArrival, purchaseDetail.getPrice());
+        StockJournalDetails stockJournalDetails = calculateUnitPrice(stockJournalType.getType(), productId, warehouseId, inOutQuantity, purchaseArrival, purchasePrice);
 
         //操作库存
         InOutBo inOutBo = new InOutBo(productId, inOutQuantity);

hx-wms/src/main/resources/mapper/stock/StockWaitMapper.xml

@@ -48,9 +48,9 @@
         FROM
             stock_wait_details swd
                 LEFT JOIN bytesailing_purchase.arrival_detail ad ON swd.business_details_id = ad.id
-                AND del_flag = 0
+                AND ad.del_flag = 0
                 LEFT JOIN bytesailing_purchase.purchase_detail pd ON ad.purchase_detail_id = pd.id
-                AND del_flag = 0
+                AND pd.del_flag = 0
             ${ew.customSqlSegment}
     </select>