BJ_ZTEITS-Developers / parking-cloud-yudao

Commit e85fcd8bd76345e45663545870028611c064fb15

Authored by dadiyang
1 parent 13497969

fix(erp)：A39修正——inCount展示只统计已审核，超订单数量校验单独统计全部入库单(含未审核) 

原A39修复把 selectListByOrderId 过滤成只查已审核，导致同方法内的超订单数量校验
(inCount>count 抛错)也只算已审核——未审核的超额入库单不再触发拦截，ERP-22 复验时
超额入库被误放行(回归)。现拆成两条口径：inCount 展示用已审核(反审核自然回退)，
超量校验用新增 selectListAllByOrderId 查全部入库单，二者互不影响。
Inline Side-by-side
Showing 2 changed files with 26 additions and 7 deletions
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInMapper.java
  View file @e85fcd8
@@ -71,4 +71,10 @@ public interface ErpPurchaseInMapper extends BaseMapperX<ErpPurchaseInDO> { @@ -71,4 +71,10 @@ public interface ErpPurchaseInMapper extends BaseMapperX<ErpPurchaseInDO> {
71 .eq(ErpPurchaseInDO::getStatus, ErpAuditStatus.APPROVE.getStatus())); 71 .eq(ErpPurchaseInDO::getStatus, ErpAuditStatus.APPROVE.getStatus()));
72 } 72 }
73 73
  74 + default List<ErpPurchaseInDO> selectListAllByOrderId(Long orderId) {
  75 + // 超订单数量校验需要统计「全部」入库单（含未审核）：未审核入库单同样占用订单可入库额度
  76 + return selectList(new LambdaQueryWrapper<ErpPurchaseInDO>()
  77 + .eq(ErpPurchaseInDO::getOrderId, orderId));
  78 + }
  79 +
74 } 80 }
75 \ No newline at end of file 81 \ No newline at end of file
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java
  View file @e85fcd8
@@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO; @@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
11 import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInDO; 11 import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInDO;
12 import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInItemDO; 12 import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInItemDO;
13 import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO; 13 import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
  14 +import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderItemDO;
14 import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseInItemMapper; 15 import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseInItemMapper;
15 import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseInMapper; 16 import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseInMapper;
16 import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO; 17 import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
@@ -144,13 +145,25 @@ public class ErpPurchaseInServiceImpl implements ErpPurchaseInService { @@ -144,13 +145,25 @@ public class ErpPurchaseInServiceImpl implements ErpPurchaseInService {
144 } 145 }
145 146
146 private void updatePurchaseOrderInCount(Long orderId) { 147 private void updatePurchaseOrderInCount(Long orderId) {
147 - // 1.1 查询采购订单对应的采购入库单列表  
148 - List<ErpPurchaseInDO> purchaseIns = purchaseInMapper.selectListByOrderId(orderId);  
149 - // 1.2 查询对应的采购订单项的入库数量  
150 - Map<Long, BigDecimal> returnCountMap = purchaseInItemMapper.selectOrderItemCountSumMapByInIds(  
151 - convertList(purchaseIns, ErpPurchaseInDO::getId));  
152 - // 2. 更新采购订单的入库数量  
153 - purchaseOrderService.updatePurchaseOrderInCount(orderId, returnCountMap); 148 + // 1.1 查询「已审核」采购入库单：入库进度（inCount 展示）只统计已审核的入库单，反审核后自然回退
  149 + List<ErpPurchaseInDO> approvedIns = purchaseInMapper.selectListByOrderId(orderId);
  150 + Map<Long, BigDecimal> inCountMap = purchaseInItemMapper.selectOrderItemCountSumMapByInIds(
  151 + convertList(approvedIns, ErpPurchaseInDO::getId));
  152 + // 1.2 查询「全部」采购入库单（含未审核）：超订单数量校验需统计全部入库单，未审核入库单同样占用可入库额度
  153 + List<ErpPurchaseInDO> allIns = purchaseInMapper.selectListAllByOrderId(orderId);
  154 + Map<Long, BigDecimal> allCountMap = purchaseInItemMapper.selectOrderItemCountSumMapByInIds(
  155 + convertList(allIns, ErpPurchaseInDO::getId));
  156 + // 2. 超订单数量校验：全部入库单（含未审核）数量之和不得超过采购订单项数量
  157 + List<ErpPurchaseOrderItemDO> orderItems = purchaseOrderService.getPurchaseOrderItemListByOrderId(orderId);
  158 + for (ErpPurchaseOrderItemDO item : orderItems) {
  159 + BigDecimal allCount = allCountMap.getOrDefault(item.getId(), BigDecimal.ZERO);
  160 + if (allCount.compareTo(item.getCount()) > 0) {
  161 + throw exception(PURCHASE_ORDER_ITEM_IN_FAIL_PRODUCT_EXCEED,
  162 + productService.getProduct(item.getProductId()).getName(), item.getCount());
  163 + }
  164 + }
  165 + // 3. 更新采购订单的入库数量（inCount 展示 = 已审核）
  166 + purchaseOrderService.updatePurchaseOrderInCount(orderId, inCountMap);
154 } 167 }
155 168
156 @Override 169 @Override