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

chenlu

2024-03-01 37931d04e87cbae60cf833890c2c8432b389fa1a

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

@@ -36,7 +36,6 @@
            @PathVariable Date selectTime1,
            @PathVariable Date selectTime2,
            @RequestBody FlowCard  flowCard){
    //    System.out.println(selectTime1+" "+selectTime2+" "+flowCard.toString());
        return Result.seccess(flowCardService.selectAddProcess(selectTime1,selectTime2,flowCard));

    }
@@ -71,7 +70,6 @@
    public Result updateLayoutStatus(
            @PathVariable String processId
    ){
        System.out.println(flowCardService.UpdateLayoutStatusSv(processId));
        if(flowCardService.UpdateLayoutStatusSv(processId)){
            return Result.seccess();
        }else {
@@ -93,7 +91,6 @@
    //添加流程卡
    @PostMapping("/addFlowCard")
    public Result AddOrderWork( @RequestBody Map<String,Object> object){
        System.out.println("obj:"+object);
        if(flowCardService.AddFlowCardSv(object)){
            return Result.seccess();
        }else {