Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材

yuan

4 天以前 0bc2c552b180afa16e4aae3c8c12746b15ba6fc8

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

@@ -16,6 +16,7 @@
import org.springframework.stereotype.Component;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Collections;

@Component
@@ -67,7 +68,7 @@
     * @param recordType
     * @param recordId
     */
    public void addStock(Long productModelId, BigDecimal quantity, String recordType, Long recordId,String batchNo,String customer) {
    public void addStock(Long productModelId, BigDecimal quantity, String recordType, Long recordId, String batchNo, String customer, LocalDate productionDate) {
        StockInventoryDto stockInventoryDto = new StockInventoryDto();
        stockInventoryDto.setRecordId(recordId);
        if (recordType != null) {
@@ -77,6 +78,11 @@
        stockInventoryDto.setProductModelId(productModelId);
        stockInventoryDto.setBatchNo(batchNo);
        stockInventoryDto.setCustomer(customer);
        if (stockInventoryDto.getProductionDate() == null) {
            stockInventoryDto.setProductionDate(LocalDate.now());
        }else {
            stockInventoryDto.setProductionDate(productionDate);
        }
        stockInventoryService.addstockInventory(stockInventoryDto);
    }