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

chenlu

昨天 ed381604d4cb6b186ed4bacb9eceb4908b857de2

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

 north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue

@@ -317,7 +317,7 @@
          {{ row.orderId }}
          {{ row.customerName?'--':'' }}
          {{ row.customerName}}
          {{ row.project?'--':'' }}
          {{row.project?'--':'' }}
          {{row.project}}
          {{ row.batch?'--':'' }}
          {{row.batch}}

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

@@ -161,8 +161,8 @@
            throw new ServiceException(Constants.Code_600, "上工序已完工数量小于本工序报工数量，请检查");
        }
    }
    @ApiOperation("mes报工接口测试")
    @PostMapping  ("/mesReportingWork1")
    @ApiOperation("mes报工接口Redis")
    @PostMapping  ("/mesReportingWorkRedis")
    public Result mesReportingWorkSvToRedis(@RequestBody Map<String,Object> reportingWork) throws JsonProcessingException, InterruptedException {
        return reportingWorkService.mesReportingWorkSvToRedis(reportingWork);
    }

 north-glass-erp/src/main/java/com/example/erp/scheduling/ScheduledTasks.java

@@ -10,8 +10,8 @@
public class ScheduledTasks {
    private final ReportingWorkService reportingWorkService;

//    @Scheduled( fixedRate = 2*60*1000)
//    public void reportingWorkRedisToMysql() throws InterruptedException {
//        reportingWorkService.redisToMysqlReportingWork();
//    }
    @Scheduled( fixedRate = 2*60*1000)
    public void reportingWorkRedisToMysql() throws InterruptedException {
        reportingWorkService.redisToMysqlReportingWork();
    }
}