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

廖井涛

2024-05-11 91f291a2c3b4e41fc0b44f2395ad5c956803ee8c

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

@@ -2,6 +2,7 @@

import com.example.erp.common.Constants;
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;
@@ -44,7 +45,6 @@
            @PathVariable Date selectTime2,
            @RequestBody FlowCard  flowCard){
        return Result.seccess(flowCardService.selectAddProcess(selectTime1,selectTime2,flowCard));

    }

    //分架明细查询
@@ -59,8 +59,8 @@
    }


    //删除工单
    @ApiOperation("删除工单接口")
    //删除流程卡
    @ApiOperation("删除流程卡接口")
    @PostMapping("/deleteFlowCard/{orderId}/{processId}")
    public Result deleteOrderWork(
            @PathVariable String orderId,
@@ -69,18 +69,19 @@
        if(flowCardService.deleteFlowCardSv(orderId,processId)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"删除失败");
            throw new ServiceException(Constants.Code_500,"删除失败,请检查是否已报工");

        }
    }

    //修改排版状态
    @ApiOperation("修改排版状态接口")
    @PostMapping("/updateLayoutStatus/{processId}")
    @PostMapping("/updateLayoutStatus/{processId}/{state}")
    public Result updateLayoutStatus(
            @PathVariable String processId
            @PathVariable String processId,
            @PathVariable Integer state
    ){
        if(flowCardService.updateLayoutStatusSv(processId)){
        if(flowCardService.updateLayoutStatusSv(processId,state)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"修改失败");
@@ -134,5 +135,39 @@
        return Result.seccess(flowCardService.selectSchedulingSv(selectTime1,selectTime2,orderId,processes,state,flowCard));

    }
    //流程卡明细查询
    @ApiOperation("流程卡明细查询接口")
    @PostMapping  ("/flowCardDetail/{processId}")
    public Result flowCardDetail(
            @PathVariable String processId,
            @RequestBody FlowCard flowCard){
        return Result.seccess(flowCardService.flowCardDetailSv(processId,flowCard));

    }

    @ApiOperation("流程卡打印查询接口")
    @PostMapping  ("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}")
    public Result selectPrintFlowCard(
            @PathVariable Date selectTime1,
            @PathVariable Date selectTime2,
            @PathVariable String orderId,
            @PathVariable String project,
            @RequestBody FlowCard flowCard){
        return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1,selectTime2,orderId,project,flowCard));
    }

    @ApiOperation("流程卡明细查询接口")
    @PostMapping  ("/selectPrint/{orderId}")
    public Result selectPrint(
            @PathVariable String orderId,
            @RequestBody FlowCard flowCard){
        return Result.seccess(flowCardService.selectPrintSv(orderId,flowCard));

    }

    @ApiOperation("打印流程卡数据查询接口")
    @PostMapping("/getSelectPrinting")
    public Result getSelectPrinting( @RequestBody Map<String,Object> object){
        return Result.seccess(flowCardService.getSelectPrintingSv(object));
    }
}