fix(erp)：采购订单入库进度 inCount 只统计已审核入库单，且状态变更(审核/反审核)后触发重算——反审核后 inCount 自然回退（A39）

dadiyang
1 parent 8e43004c
Showing 2 changed files with 8 additions and 1 deletions
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInMapper.java
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java
@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.in.ErpPurchaseIn
 import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInDO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInItemDO;
 import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.ibatis.annotations.Mapper;
  
@@ -64,7 +65,10 @@ public interface ErpPurchaseInMapper extends BaseMapperX&lt;ErpPurchaseInDO&gt; {
     }
  
     default List<ErpPurchaseInDO> selectListByOrderId(Long orderId) {
-        return selectList(ErpPurchaseInDO::getOrderId, orderId);
+        // 入库进度只统计「已审核」的入库单：未审核/已反审核的入库单不计入订单 inCount（反审核后自然回退）
+        return selectList(new LambdaQueryWrapper<ErpPurchaseInDO>()
+                .eq(ErpPurchaseInDO::getOrderId, orderId)
+                .eq(ErpPurchaseInDO::getStatus, ErpAuditStatus.APPROVE.getStatus()));
     }
  
 }
 \ No newline at end of file
@@ -185,6 +185,9 @@ public class ErpPurchaseInServiceImpl implements ErpPurchaseInService {
                     purchaseInItem.getProductId(), purchaseInItem.getWarehouseId(), count,
                     bizType, purchaseInItem.getInId(), purchaseInItem.getId(), purchaseIn.getNo()));
         });
+
+        // 4. 状态变更后重算采购订单入库进度（反审核的入库单不再计入，inCount 自然回退）
+        updatePurchaseOrderInCount(purchaseIn.getOrderId());
     }
  
     @Override