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

zhang

2025-07-15 641f7bb8b2d2e23f1f5192fecf030a567151c7b5

 src/main/java/com/zy/asrs/task/WorkLogScheduler.java

@@ -32,7 +32,7 @@
    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute(){
        List<WrkMast> wrkMasts = wrkMastService.selectToBeHistoryData();
        if (wrkMasts.isEmpty()) {
        if (Cools.isEmpty(wrkMasts) || wrkMasts.size()==0) {
            return;
        }
        for (WrkMast wrkMast : wrkMasts) {
@@ -51,7 +51,7 @@
    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute3(){
        List<WrkMast> wrkMasts = wrkMastService.selectToBeHistoryData2();
        if (wrkMasts.isEmpty()) {
        if (Cools.isEmpty(wrkMasts) || wrkMasts.size()==0) {
            return;
        }
        for (WrkMast wrkMast : wrkMasts) {