Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

2025-12-02 fd2ec4214c6f8456b957c3545e7d67bcdbbb9985

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java

@@ -2,17 +2,13 @@

import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.dto.pp.FlowCardDTO;
import com.example.erp.dto.pp.TeamOutputDTO;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.DeliveryDetail;
import com.example.erp.entity.sd.Order;
import com.example.erp.common.Result;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.dto.pp.FlowCardDTO;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.FlowCardService;
import com.example.erp.tools.DownExcel;
import com.fasterxml.jackson.core.JsonProcessingException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +16,7 @@

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.sql.Date;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

@@ -431,11 +427,19 @@

    @ApiOperation("工程明细打印查询")
    @PostMapping("/selectPrintProjectDetails/{projectNo}")
    public Result selectPrintProjectDetails(
                                               @PathVariable String projectNo) {
    public Result selectPrintProjectDetails( @PathVariable String projectNo) {
        return Result.success(flowCardService.getPrintProjectDetails(projectNo));

    }

    @ApiOperation("工程明细小片打印查询")
    @PostMapping("/selectPrintProjectDetailSmallPiece")
    public Result selectPrintProjectDetailSmallPiece(
            @RequestBody Map<String, Object> object) throws JsonProcessingException {
        return Result.success(flowCardService.selectPrintProjectDetailSmallPiece(object));

    }

    @ApiOperation("工程明细打印标签查询")
    @PostMapping("/getPrintCustomDataProjectNoDetail/{type}/{detailType}")
    public Result getPrintCustomDataProjectNoDetail(
@@ -444,6 +448,15 @@
            @RequestBody Map<String, Object> object) {
        return Result.success(flowCardService.getPrintCustomDataProjectNoDetailSv(type,detailType,object));

    }

    @ApiOperation("获取最报工新工序")
    @PostMapping("/getNewProcess/{processId}/{orderNumber}/{technologyNumber}/{orderProcess}")
    public Result getNewProcess(@PathVariable String processId,
                                @PathVariable String orderNumber,
                                @PathVariable String technologyNumber,
                                @PathVariable List<String> orderProcess){
        return Result.success(flowCardService.getNewProcessSv(processId,orderNumber,technologyNumber,orderProcess));
    }

    @ApiOperation("修改工艺流程")
@@ -512,6 +525,15 @@
        return Result.success(flowCardService.updateTerminationSv(processId,orderNumber,value));
    }

    @ApiOperation("取消终止")
    @PostMapping("/updateTerminationNo/{processId}/{orderNumber}")
    public Result updateTerminationNo(
            @PathVariable String processId,
            @PathVariable Integer orderNumber) {

        return Result.success(flowCardService.updateTerminationNoSv(processId,orderNumber));
    }

    @ApiOperation("查询用于修改生产终止数量的完工数量")
    @PostMapping("/selectCompleted/{processId}/{orderNumber}/{process}")
    public Result selectCompleted(
@@ -521,4 +543,10 @@
        return Result.success(flowCardService.selectCompletedSv(processId, orderNumber,process));

    }

    @ApiOperation("根据不同参数查询流程卡生产进度")
    @PostMapping("/selectProcessCardProgress")
    public Result selectProcessCardProgress(@RequestBody Map<String, String> object) {
        return flowCardService.selectProcessCardProgressSv(object);
    }
}