yys 1.已退货完毕的出库单号不要展示在关联出库单中 2.退货管理唯一处理 3.生产订单-库存数量回显 4.发货管理回显退货数量 5.发货增加详情接...

云

2026-03-21 7b2233d1dab53574facc66b3bebffcd8ca5919de

 src/main/java/com/ruoyi/sales/service/impl/ShippingInfoDetailServiceImpl.java

@@ -6,6 +6,7 @@
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.other.service.impl.TempFileServiceImpl;
import com.ruoyi.procurementrecord.service.impl.ReturnManagementServiceImpl;
import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.pojo.ShippingInfoDetail;
@@ -48,11 +49,16 @@
    @Autowired
    private CommonFileServiceImpl commonFileService;

    @Autowired
    private ReturnManagementServiceImpl returnManagementService;

    @Override
    public IPage<ShippingInfoDetail> listPage(Page page, ShippingInfoDetail shippingInfoDetail) {
        IPage<ShippingInfoDetail> shippingInfoDetailIPage = shippingInfoDetailMapper.listPage(page, shippingInfoDetail);
        shippingInfoDetailIPage.getRecords().forEach(item ->{
            item.setCommonFileList(commonFileService.getFileListByBusinessId(item.getId(), FileNameType.SHIP.getValue()));
            BigDecimal returnSaleProductCountByShippingId = returnManagementService.getReturnSaleProductCountByShippingId(Collections.singletonList(item.getId()));
            item.setReturnTotal(returnSaleProductCountByShippingId);
        });
        return shippingInfoDetailIPage;
    }
@@ -76,6 +82,8 @@
        }else{
            shippingInfo.setStatus("发货中");
        }
        // 扣库存
        shippingInfo.setShippingTotal(shippingInfoDetail.getShippingNum());
        shippingInfoService.deductStock(shippingInfo);
        // 迁移文件
        if(CollectionUtils.isNotEmpty(shippingInfoDetail.getTempFileIds())){