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

zss

2026-04-25 a1a7bb5093d30397078ce42ef025cd07378d1e1c

 src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java

@@ -13,39 +13,35 @@
import com.ruoyi.sales.pojo.ShipmentApproval;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ShipmentApprovalService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

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

@RestController
@RequestMapping("/shipmentApproval")
@Api(tags = "发货审批管理")
@Tag(name = "发货审批管理")
@AllArgsConstructor
public class ShipmentApprovalController extends BaseController {

    @Autowired
    private ShipmentApprovalService shipmentApprovalService;
    @Autowired
    private ShipmentApprovalMapper shipmentApprovalMapper;

    @Autowired
    private ISalesLedgerProductService salesLedgerProductService;
    @Autowired
    private StockUtils stockUtils;
    private final ShipmentApprovalService shipmentApprovalService;
    private final ShipmentApprovalMapper shipmentApprovalMapper;
    private final ISalesLedgerProductService salesLedgerProductService;
    private final StockUtils stockUtils;

    @GetMapping("/listPage")
    @ApiOperation("发货审批列表")
    @Operation(summary = "发货审批列表")
    public AjaxResult listPage(Page page, ShipmentApproval req) {
        IPage<ShipmentApproval> listPage = shipmentApprovalService.listPage(page,req);
        return AjaxResult.success(listPage);
    }

    @PostMapping("/update")
    @ApiOperation("发货审批,更新发货审批状态")
    @Operation(summary = "发货审批,更新发货审批状态")
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult update(@RequestBody ShipmentApproval req) {

@@ -99,7 +95,7 @@
     * 导出发货信息管理
     */
    @PostMapping("/export")
    @ApiOperation("导出发货审批")
    @Operation(summary = "导出发货审批")
    public void export(HttpServletResponse response) {
        List<ShipmentApproval> list = shipmentApprovalService.list();
        ExcelUtil<ShipmentApproval> util = new ExcelUtil<ShipmentApproval>(ShipmentApproval.class);