Merge branch 'dev_新疆马铃薯pro' of http://114.132.189.42:9002/r/product-invento...

huminmin

2026-06-01 0c9ee949b6a7ea8ce2bbc42cbbd2c64fb977e509

Merge branch 'dev_新疆马铃薯pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_新疆马铃薯pro

 doc/20260601_home_business_ÉÏÔÂÊý¾Ý_Ç°¶ËÁªµ÷Îĵµ.md

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,101 @@
# /home/business æŽ¥å£æ–°å¢žä¸Šæœˆæ•°æ® â€” å‰ç«¯è”调文档

## å˜æ›´æ¦‚è¿°

`GET /home/business` æŽ¥å£åœ¨åŽŸæœ‰å­—段基础上新增 **上月销售金额** å’Œ **上月采购金额** ä¸¤ä¸ªå­—段，前端可直接用于展示环比趋势。

---

## æŽ¥å£ä¿¡æ¯

| é¡¹ç›® | å†…容 |
|------|------|
| æŽ¥å£åœ°å€ | `/home/business` |
| è¯·æ±‚方式 | `GET` |
| æ˜¯å¦è®¤è¯ | æ˜¯ |

---

## å“åº”参数

### æ–°å¢žå­—段

| å­—段名 | ç±»åž‹ | è¯´æ˜Ž |
|--------|------|------|
| `lastMonthSaleMoney` | `String` | ä¸Šæœˆé”€å”®åˆåŒé‡‘额（元），保留两位小数，如 `"150000.00"` |
| `lastMonthPurchaseMoney` | `String` | ä¸Šæœˆé‡‡è´­åˆåŒé‡‘额（元），保留两位小数，如 `"80000.00"` |

### å®Œæ•´å“åº”

```json
{
  "code": 200,
  "msg": "操作成功",
  "data": {
    "monthSaleMoney": "200000.00",
    "lastMonthSaleMoney": "150000.00",
    "monthSaleHaveMoney": "0.00",
    "monthPurchaseMoney": "100000.00",
    "lastMonthPurchaseMoney": "80000.00",
    "monthPurchaseHaveMoney": "0.00",
    "inventoryNum": "5000.00",
    "todayInventoryNum": "120.00"
  }
}
```

### æ‰€æœ‰å­—段一览

| å­—段名 | ç±»åž‹ | è¯´æ˜Ž |
|--------|------|------|
| `monthSaleMoney` | `String` | æœ¬æœˆé”€å”®é‡‘额 |
| `lastMonthSaleMoney` | **`String`（新增）** | ä¸Šæœˆé”€å”®é‡‘额 |
| `monthSaleHaveMoney` | `String` | æœ¬æœˆé”€å”®æœªå¼€ç¥¨é‡‘额（当前固定 `0.00`） |
| `monthPurchaseMoney` | `String` | æœ¬æœˆé‡‡è´­é‡‘额 |
| `lastMonthPurchaseMoney` | **`String`（新增）** | ä¸Šæœˆé‡‡è´­é‡‘额 |
| `monthPurchaseHaveMoney` | `String` | æœ¬æœˆé‡‡è´­æœªå¼€ç¥¨é‡‘额（当前固定 `0.00`） |
| `inventoryNum` | `String` | å½“前库存总量 |
| `todayInventoryNum` | `String` | ä»Šæ—¥å…¥åº“数量 |

---

## æ•°æ®å£å¾„

| å­—段 | æ•°æ®æ¥æº | ç»Ÿè®¡å£å¾„ |
|------|---------|---------|
| `monthSaleMoney` | `sales_ledger` è¡¨ | `entry_date` åœ¨æœ¬æœˆ1日~下月1日之间的 `contract_amount` åˆè®¡ |
| `lastMonthSaleMoney` | `sales_ledger` è¡¨ | `entry_date` åœ¨ä¸Šæœˆ1日~本月1日之间的 `contract_amount` åˆè®¡ |
| `monthPurchaseMoney` | `purchase_ledger` è¡¨ | `entry_date` åœ¨æœ¬æœˆ1日~下月1日之间的 `contract_amount` åˆè®¡ |
| `lastMonthPurchaseMoney` | `purchase_ledger` è¡¨ | `entry_date` åœ¨ä¸Šæœˆ1日~本月1日之间的 `contract_amount` åˆè®¡ |

---

## å‰ç«¯ä½¿ç”¨å»ºè®®

### çŽ¯æ¯”展示

```javascript
// è®¡ç®—环比变化
const saleGrowth = lastMonthSaleMoney > 0
  ? ((monthSaleMoney - lastMonthSaleMoney) / lastMonthSaleMoney * 100).toFixed(1)
  : 100;

const purchaseGrowth = lastMonthPurchaseMoney > 0
  ? ((monthPurchaseMoney - lastMonthPurchaseMoney) / lastMonthPurchaseMoney * 100).toFixed(1)
  : 100;
```

### è¶‹åŠ¿ç®­å¤´

- `saleGrowth > 0` â†’ çº¢è‰²å‘上箭头 (↑)
- `saleGrowth < 0` â†’ ç»¿è‰²å‘下箭头 (↓)
- `saleGrowth === 0` â†’ ç°è‰²æŒå¹³ (→)

---

## æ³¨æ„äº‹é¡¹

1. **类型为 String**：金额字段均为字符串，保留两位小数，计算环比时需用 `parseFloat()` è½¬æ¢
2. **默认值**：无数据时返回 `"0.00"`，不会返回 `null`
3. **未开票字段**：`monthSaleHaveMoney` å’Œ `monthPurchaseHaveMoney` å½“前固定返回 `"0.00"`，后续迭代会接入实际数据
4. **向后兼容**：仅新增字段，原有字段不变，已有前端功能不受影响

 src/main/java/com/ruoyi/approve/bean/dto/ApprovalInstanceDto.java

@@ -2,6 +2,8 @@

import com.ruoyi.approve.pojo.ApprovalInstance;
import com.ruoyi.basic.dto.StorageBlobDTO;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import java.util.List;
@@ -18,4 +20,7 @@
    private String createTimeStart;

    private List<StorageBlobDTO> storageBlobDTOs;

    @Schema(description = "出库批号")
    private String outboundBatches;
}

 src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java

@@ -690,8 +690,7 @@
    private void handleShippingApprovalFinished(ApprovalInstance instance, String status) {
        ShippingInfo shippingInfo = shippingInfoMapper.selectOne(
                new LambdaQueryWrapper<ShippingInfo>()
                        .eq(ShippingInfo::getId, instance.getTitle())
                        .orderByDesc(ShippingInfo::getCreateTime)
                        .eq(ShippingInfo::getId, instance.getBusinessId())
                        .last("limit 1")
        );
        if (shippingInfo == null) {

 src/main/java/com/ruoyi/home/dto/HomeBusinessDto.java

@@ -16,12 +16,18 @@
    @Schema(description = "本月销售金额")
    private String monthSaleMoney = "0.00";

    @Schema(description = "上月销售金额")
    private String lastMonthSaleMoney = "0.00";

    @Schema(description = "本月销售未开票金额")
    private String monthSaleHaveMoney = "0.00";

    @Schema(description = "本月采购金额")
    private String monthPurchaseMoney = "0.00";

    @Schema(description = "上月采购金额")
    private String lastMonthPurchaseMoney = "0.00";

    @Schema(description = "本月采购未开票金额")
    private String monthPurchaseHaveMoney = "0.00";


 src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java

@@ -179,6 +179,34 @@
            homeBusinessDto.setMonthPurchaseMoney(receiveAmount.setScale(2, RoundingMode.HALF_UP).toString());
            homeBusinessDto.setMonthPurchaseHaveMoney(BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP).toString());
        }

        // ä¸Šæœˆé”€å”®é‡‘额
        YearMonth lastMonth = currentMonth.minusMonths(1);
        LambdaQueryWrapper<SalesLedger> lastMonthSalesWrapper = new LambdaQueryWrapper<>();
        lastMonthSalesWrapper.ge(SalesLedger::getEntryDate, lastMonth.atDay(1).atStartOfDay())
                .lt(SalesLedger::getEntryDate, lastMonth.plusMonths(1).atDay(1).atStartOfDay());
        List<SalesLedger> lastMonthSalesLedgers = salesLedgerMapper.selectList(lastMonthSalesWrapper);
        if (!CollectionUtils.isEmpty(lastMonthSalesLedgers)) {
            BigDecimal lastMonthContractAmount = lastMonthSalesLedgers.stream()
                    .map(SalesLedger::getContractAmount)
                    .filter(Objects::nonNull)
                    .reduce(BigDecimal.ZERO, BigDecimal::add);
            homeBusinessDto.setLastMonthSaleMoney(lastMonthContractAmount.setScale(2, RoundingMode.HALF_UP).toString());
        }

        // ä¸Šæœˆé‡‡è´­é‡‘额
        LambdaQueryWrapper<PurchaseLedger> lastMonthPurchaseWrapper = new LambdaQueryWrapper<>();
        lastMonthPurchaseWrapper.ge(PurchaseLedger::getEntryDate, lastMonth.atDay(1).atStartOfDay())
                .lt(PurchaseLedger::getEntryDate, lastMonth.plusMonths(1).atDay(1).atStartOfDay());
        List<PurchaseLedger> lastMonthPurchaseLedgers = purchaseLedgerMapper.selectList(lastMonthPurchaseWrapper);
        if (!CollectionUtils.isEmpty(lastMonthPurchaseLedgers)) {
            BigDecimal lastMonthPurchaseAmount = lastMonthPurchaseLedgers.stream()
                    .map(PurchaseLedger::getContractAmount)
                    .filter(Objects::nonNull)
                    .reduce(BigDecimal.ZERO, BigDecimal::add);
            homeBusinessDto.setLastMonthPurchaseMoney(lastMonthPurchaseAmount.setScale(2, RoundingMode.HALF_UP).toString());
        }

        // ç»Ÿè®¡åº“å­˜
        BigDecimal stockQuantityTotal = stockInventoryMapper.selectTotal();
        homeBusinessDto.setInventoryNum(stockQuantityTotal.setScale(2, RoundingMode.HALF_UP).toString());

 src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java

@@ -154,12 +154,27 @@
     * @param recordId
     */
    public void substractStock(Long productModelId, BigDecimal quantity, String recordType, Long recordId, String batchNo) {
        substractStock(productModelId, quantity, recordType, recordId, batchNo, null);
    }

    /**
     * åˆæ ¼å‡ºåº“（带出库批号）
     *
     * @param productModelId
     * @param quantity
     * @param recordType
     * @param recordId
     * @param batchNo
     * @param outboundBatches å‡ºåº“批号，如果为空则自动生成
     */
    public void substractStock(Long productModelId, BigDecimal quantity, String recordType, Long recordId, String batchNo, String outboundBatches) {
        StockInventoryDto stockInventoryDto = new StockInventoryDto();
        stockInventoryDto.setRecordId(recordId);
        stockInventoryDto.setRecordType(String.valueOf(recordType));
        stockInventoryDto.setQualitity(quantity);
        stockInventoryDto.setProductModelId(productModelId);
        stockInventoryDto.setBatchNo(batchNo);
        stockInventoryDto.setOutboundBatches(outboundBatches);
        stockInventoryService.addStockOutRecordOnly(stockInventoryDto);
    }


 src/main/java/com/ruoyi/quality/controller/QualityInspectController.java

@@ -5,6 +5,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.quality.dto.BatchQuickInspectRequest;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
@@ -143,13 +144,13 @@
    }

    /**
     * æ‰¹é‡å¿«é€Ÿæ£€éªŒï¼šä¸€é”®é€šè¿‡å¹¶æäº¤
     * æ‰¹é‡å¿«é€Ÿæ£€éªŒï¼šæ”¯æŒåŽŸææ–™æ£€éªŒã€è¿‡ç¨‹æ£€éªŒã€å‡ºåŽ‚检验
     */
    @PostMapping("/batchQuickInspect")
    @Operation(summary = "批量快速检验")
    @Log(title = "批量快速检验", businessType = BusinessType.OTHER)
    public R<?> batchQuickInspect(@RequestBody List<Long> ids) {
        return qualityInspectService.batchQuickInspect(ids);
    public R<?> batchQuickInspect(@RequestBody BatchQuickInspectRequest request) {
        return qualityInspectService.batchQuickInspect(request);
    }

    /**

 src/main/java/com/ruoyi/quality/dto/BatchQuickInspectRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,42 @@
package com.ruoyi.quality.dto;

import com.ruoyi.quality.pojo.QualityInspectParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

@Data
public class BatchQuickInspectRequest {

    @Schema(description = "检验单ID列表")
    private List<Long> ids;

    @Schema(description = "检测结果：合格/不合格/部分合格")
    private String checkResult;

    @Schema(description = "指标标准ID")
    private Long testStandardId;

    @Schema(description = "总数量")
    private BigDecimal quantity;

    @Schema(description = "合格数量")
    private BigDecimal qualifiedQuantity;

    @Schema(description = "不合格数量")
    private BigDecimal unqualifiedQuantity;

    @Schema(description = "检测单位")
    private String checkCompany;

    @Schema(description = "检验员姓名")
    private String checkName;

    @Schema(description = "检测日期，格式：YYYY-MM-DD")
    private String checkTime;

    @Schema(description = "检验参数列表")
    private List<QualityInspectParam> paramList;
}

 src/main/java/com/ruoyi/quality/service/IQualityInspectService.java

@@ -4,11 +4,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.quality.dto.BatchQuickInspectRequest;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.pojo.QualityInspect;

import jakarta.servlet.http.HttpServletResponse;
import java.util.List;

public interface IQualityInspectService extends IService<QualityInspect> {

@@ -28,9 +28,9 @@
    R autoSubmit(Long id);

    /**
     * æ‰¹é‡å¿«é€Ÿæ£€éªŒï¼šä¸€é”®é€šè¿‡å¹¶æäº¤
     * æ‰¹é‡å¿«é€Ÿæ£€éªŒ
     */
    R batchQuickInspect(List<Long> ids);
    R batchQuickInspect(BatchQuickInspectRequest request);

    void down(HttpServletResponse response, QualityInspect qualityInspect);
}

 src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java

@@ -17,6 +17,7 @@
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.quality.dto.BatchQuickInspectRequest;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.quality.mapper.QualityTestStandardMapper;
@@ -35,14 +36,17 @@
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

import java.io.InputStream;
import java.io.OutputStream;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.sql.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -187,21 +191,150 @@
    }

    @Override
    public R batchQuickInspect(List<Long> ids) {
        if (ids == null || ids.isEmpty()) {
    public R batchQuickInspect(BatchQuickInspectRequest request) {
        // 1. æ•°æ®æ ¡éªŒ
        if (request.getIds() == null || request.getIds().isEmpty()) {
            return R.fail("请选择至少一条检验单");
        }
        int success = 0;
        int fail = 0;
        for (Long id : ids) {
            R result = autoSubmit(id);
            if (R.isSuccess(result)) {
                success++;
        List<String> validResults = Arrays.asList("合格", "不合格", "部分合格");
        if (!validResults.contains(request.getCheckResult())) {
            return R.fail("检测结果必须为：合格、不合格、部分合格");
        }
        if (request.getQuantity() == null || request.getQuantity().compareTo(BigDecimal.ZERO) <= 0) {
            return R.fail("总数量必须大于0");
        }
        if (request.getTestStandardId() == null) {
            return R.fail("指标标准ID不能为空");
        }
        // quantity = qualifiedQuantity + unqualifiedQuantity
        BigDecimal qty = request.getQuantity();
        BigDecimal qualified = request.getQualifiedQuantity() != null ? request.getQualifiedQuantity() : BigDecimal.ZERO;
        BigDecimal unqualified = request.getUnqualifiedQuantity() != null ? request.getUnqualifiedQuantity() : BigDecimal.ZERO;
        if (qty.compareTo(qualified.add(unqualified)) != 0) {
            return R.fail("总数量必须等于合格数量加不合格数量");
        }
        String checkResult = request.getCheckResult();
        if ("合格".equals(checkResult)) {
            if (qualified.compareTo(qty) != 0 || unqualified.compareTo(BigDecimal.ZERO) != 0) {
                return R.fail("检验结果为合格时，合格数量应等于总数量，不合格数量应为0");
            }
        } else if ("不合格".equals(checkResult)) {
            if (qualified.compareTo(BigDecimal.ZERO) != 0 || unqualified.compareTo(qty) != 0) {
                return R.fail("检验结果为不合格时，合格数量应为0，不合格数量应等于总数量");
            }
            } else {
                fail++;
            if (qualified.compareTo(BigDecimal.ZERO) <= 0 || unqualified.compareTo(BigDecimal.ZERO) <= 0) {
                return R.fail("检验结果为部分合格时，合格数量和不合格数量都必须大于0");
            }
        }
        return R.ok(String.format("快速检验完成：成功 %d æ¡ï¼Œå¤±è´¥ %d æ¡", success, fail));

        // è§£æžæ£€æµ‹æ—¥æœŸ
        Date checkTimeDate = null;
        if (request.getCheckTime() != null && !request.getCheckTime().isEmpty()) {
            checkTimeDate = Date.valueOf(LocalDate.parse(request.getCheckTime()));
        }

        int success = 0;
        List<String> errors = new ArrayList<>();

        for (Long id : request.getIds()) {
            try {
                // ä½¿ç”¨ç‹¬ç«‹äº‹åŠ¡å¤„理每个检验单，避免单个失败影响整体事务
                processSingleInspect(id, request, checkResult, qty, qualified, unqualified, checkTimeDate);
                success++;
            } catch (Exception e) {
                errors.add("检验单 " + id + " å¤„理失败：" + e.getMessage());
            }
        }

        if (!errors.isEmpty()) {
            return R.ok(String.format("快速检验完成：成功 %d æ¡ï¼Œå¤±è´¥ %d æ¡ã€‚失败原因：%s",
                    success, errors.size(), String.join("；", errors)));
        }
        return R.ok(String.format("快速检验完成：成功 %d æ¡", success));
    }

    /**
     * åœ¨ç‹¬ç«‹äº‹åŠ¡ä¸­å¤„理单个检验单
     */
    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
    public void processSingleInspect(Long id, BatchQuickInspectRequest request,
                                     String checkResult, BigDecimal qty,
                                     BigDecimal qualified, BigDecimal unqualified,
                                     Date checkTimeDate) {
        QualityInspect qualityInspect = qualityInspectMapper.selectById(id);
        if (qualityInspect == null) {
            throw new RuntimeException("检验单不存在");
        }
        if (Integer.valueOf(1).equals(qualityInspect.getInspectState())) {
            throw new RuntimeException("检验单已提交");
        }

        // 2. æ›´æ–°æ£€éªŒå•å­—段
        qualityInspect.setCheckResult(checkResult);
        qualityInspect.setTestStandardId(request.getTestStandardId());
        qualityInspect.setQuantity(qty);
        qualityInspect.setQualifiedQuantity(qualified);
        qualityInspect.setUnqualifiedQuantity(unqualified);
        if (request.getCheckCompany() != null) {
            qualityInspect.setCheckCompany(request.getCheckCompany());
        }
        if (request.getCheckName() != null) {
            qualityInspect.setCheckName(request.getCheckName());
        }
        if (checkTimeDate != null) {
            qualityInspect.setCheckTime(checkTimeDate);
        }
        qualityInspect.setInspectState(1);

        // 3. ä¿å­˜æ£€éªŒå‚æ•°
        if (request.getParamList() != null && !request.getParamList().isEmpty()) {
            qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery()
                    .eq(QualityInspectParam::getInspectId, id));
            for (QualityInspectParam param : request.getParamList()) {
                param.setInspectId(id);
                param.setId(null);
            }
            qualityInspectParamService.saveBatch(request.getParamList());
        }

        // 4. æ›´æ–°æ£€éªŒå•
        qualityInspectMapper.updateById(qualityInspect);

        // 5. åˆæ ¼å…¥åº“处理
        if (qualified.compareTo(BigDecimal.ZERO) > 0) {
            StockInventoryDto stockInventoryDto = new StockInventoryDto();
            stockInventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode()));
            if (ObjectUtils.isNotEmpty(qualityInspect.getPurchaseLedgerId())) {
                stockInventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_OUT.getCode()));
            }
            stockInventoryDto.setRecordId(qualityInspect.getId());
            stockInventoryDto.setProductModelId(qualityInspect.getProductModelId());
            stockInventoryDto.setQualitity(qualified);
            if (qualityInspect.getCheckTime() != null) {
                LocalDate stockCreateDate = DateUtils.toLocalDate(qualityInspect.getCheckTime()).plusDays(1);
                stockInventoryDto.setCreateTime(LocalDateTime.of(stockCreateDate, java.time.LocalTime.MIDNIGHT));
            }
            stockInventoryDto.setBatchNo(resolveProductionBatchNo(
                    qualityInspect.getProductMainId(),
                    qualityInspect.getId(),
                    qualityInspect.getProductModelId()));
            stockInventoryService.addStockInRecordOnly(stockInventoryDto);
        }

        // 6. ä¸åˆæ ¼å¤„理
        if (unqualified.compareTo(BigDecimal.ZERO) > 0) {
            QualityUnqualified qualityUnqualified = new QualityUnqualified();
            BeanUtils.copyProperties(qualityInspect, qualityUnqualified);
            qualityUnqualified.setInspectState(0);
            qualityUnqualified.setQuantity(unqualified);
            List<QualityInspectParam> inspectParams = qualityInspectParamService.list(
                    Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, id));
            String text = inspectParams.stream().map(QualityInspectParam::getParameterItem).collect(Collectors.joining(","));
            qualityUnqualified.setDefectivePhenomena(text + "这些指标中存在不合格");
            qualityUnqualified.setInspectId(id);
            qualityUnqualifiedMapper.insert(qualityUnqualified);
        }
    }

    private String resolveProductionBatchNo(Long productionProductMainId,

 src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java

@@ -71,6 +71,10 @@
    @Excel(name = "发货车牌号")
    private String shippingCarNumber;

    @Schema(description = "出库批号")
    @Excel(name = "出库批号")
    private String outboundBatches;

    @Schema(description = "创建时间")
    private LocalDateTime createTime;


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

@@ -142,11 +142,19 @@

    @Override
    public boolean add(ShippingInfoDto req) {
        // æ ¡éªŒoutboundBatches唯一性
        if (req.getOutboundBatches() != null && !req.getOutboundBatches().isEmpty()) {
            long count = this.count(new LambdaQueryWrapper<ShippingInfo>()
                    .eq(ShippingInfo::getOutboundBatches, req.getOutboundBatches()));
            if (count > 0) {
                throw new RuntimeException("出库批号已存在，请重新输入");
            }
        }
        this.save(req);
        req.getBatchNoDetailList().forEach(item -> item.setShippingInfoId(req.getId()));
        shippingProductDetailMapper.insert(req.getBatchNoDetailList());
        for (ShippingProductDetail shippingProductDetail : req.getBatchNoDetailList()) {
            stockUtils.substractStock(shippingProductDetail.getProductModelId(), shippingProductDetail.getQuantity(), StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(), req.getId(), shippingProductDetail.getBatchNo());
            stockUtils.substractStock(shippingProductDetail.getProductModelId(), shippingProductDetail.getQuantity(), StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(), req.getId(), shippingProductDetail.getBatchNo(), req.getOutboundBatches());
        }
        // ä¿å­˜æ–‡ä»¶
        fileUtil.saveStorageAttachment(ApplicationTypeEnum.IMAGE, RecordTypeEnum.SHIPPING_INFO, req.getId(), req.getStorageBlobDTOs());
@@ -173,7 +181,10 @@
    public boolean addReq(ShippingInfoDto req) {

                LoginUser loginUser = SecurityUtils.getLoginUser();
        String sh = OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH","shipping_no",req.getCreateTime());
        // è®¾ç½®åˆ›å»ºæ—¶é—´ä¸ºå½“前时间，确保编号查询正确
        LocalDateTime now = LocalDateTime.now();
        req.setCreateTime(now);
        String sh = OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH", "shipping_no", now);
        // å…ˆä¿å­˜å‘货单，再发起审批；无审核人自动通过时需要按发货编号回写发货状态。
        req.setShippingNo(sh);
        req.setStatus("待审核");

 src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java

@@ -80,4 +80,7 @@

    @Schema(description = "产品id")
    private Long productId;

    @Schema(description = "出库批号")
    private String outboundBatches;
}

 src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java

@@ -292,6 +292,7 @@
        stockOutRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
        stockOutRecordDto.setType("0");
        stockOutRecordDto.setRemark(stockInventoryDto.getRemark());
        stockOutRecordDto.setOutboundBatches(stockInventoryDto.getOutboundBatches());
        stockOutRecordService.add(stockOutRecordDto);
        return true;
    }

 src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java

@@ -60,8 +60,11 @@

    @Override
    public int add(StockOutRecordDto stockOutRecordDto) {
        // å¦‚果传入了outboundBatches则使用，否则自动生成
        if (stockOutRecordDto.getOutboundBatches() == null || stockOutRecordDto.getOutboundBatches().isEmpty()) {
        String no = OrderUtils.countTodayByCreateTime(stockOutRecordMapper, "CK","outbound_batches", stockOutRecordDto.getCreateTime() != null ? stockOutRecordDto.getCreateTime() : LocalDateTime.now());
        stockOutRecordDto.setOutboundBatches(no);
        }
        if (StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode().equals(stockOutRecordDto.getRecordType())){
            stockOutRecordDto.setApprovalStatus(3);
        }

 src/main/resources/mapper/quality/QualityInspectMapper.xml

@@ -5,7 +5,7 @@
        SELECT
        qi.*,
        <choose>
            <when test="qualityInspect.inspectType == 0">
            <when test="qualityInspect.inspectType != 2">
                pl.purchase_contract_number as purchase_contract_no
            </when>
            <otherwise>
@@ -16,7 +16,7 @@
        FROM
        quality_inspect qi
        <choose>
            <when test="qualityInspect.inspectType == 0 ">
            <when test="qualityInspect.inspectType != 2 ">
                LEFT JOIN purchase_ledger pl ON pl.id = qi.purchase_ledger_id
            </when>
            <otherwise>

 src/main/resources/mapper/sales/ShippingInfoMapper.xml

@@ -19,6 +19,7 @@
        s.update_user,
        s.tenant_id,
        sl.sales_contract_no,
        s.outbound_batches,
        pm.model as specification_model,
        pm.unit,
        p.product_name,