Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

2026-04-23 a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488

 src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java

@@ -10,15 +10,13 @@
import com.ruoyi.purchase.mapper.SalesLedgerProductTemplateMapper;
import com.ruoyi.purchase.pojo.PurchaseLedgerTemplate;
import com.ruoyi.purchase.pojo.SalesLedgerProductTemplate;
import com.ruoyi.purchase.service.PurchaseLedgerTemplateService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.HashMap;
import java.util.List;

/**
@@ -32,12 +30,10 @@
@RestController
@RequestMapping("/purchaseLedgerTemplate")
@Api(tags = "采购台账模板")
@AllArgsConstructor
public class PurchaseLedgerTemplateController {

    @Autowired
    private PurchaseLedgerTemplateMapper purchaseLedgerTemplateMapper;

    @Autowired
    private SalesLedgerProductTemplateMapper salesLedgerProductTemplateMapper;

    @PostMapping("/add")
@@ -102,6 +98,7 @@
                SalesLedgerProductTemplate salesLedgerProductTemplate = new SalesLedgerProductTemplate();
                BeanUtils.copyProperties(product, salesLedgerProductTemplate);
                salesLedgerProductTemplate.setSalesLedgerId(purchaseLedgerTemplate.getId());
                salesLedgerProductTemplate.setType(2);
                salesLedgerProductTemplateMapper.insert(salesLedgerProductTemplate);
            });
        }