#

zjj

2024-10-29 d0d0224f72333576d81d2cf1ac19e6f3e58c093f

#

 src/main/java/com/zy/asrs/entity/WrkDetlLog.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -356,6 +357,8 @@
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }

    public void sync(Object source) {
        Synchro.Copy(source, this);
    }

}

 src/main/java/com/zy/asrs/entity/WrkMastLog.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.zy.asrs.service.*;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import com.core.common.Cools;
@@ -505,5 +506,8 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
    }

    public void sync(Object source) {
        Synchro.Copy(source, this);
    }

}

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -2,9 +2,7 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -14,6 +12,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.util.Date;
import java.util.Iterator;
import java.util.List;

@@ -94,18 +93,40 @@
//                }
            }



            // 保存工作主档历史档
            if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
//            if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
//                exceptionHandle("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());
//            }

            Date now = new Date();
            WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrkNo", wrkMast.getWrkNo()));
            WrkMastLog wrkMastLog = new WrkMastLog();
            wrkMastLog.sync(wrkMast1);
            wrkMastLog.setModiTime(now);
            if (!wrkMastLogService.insert(wrkMastLog)){
                exceptionHandle("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());
            }

            // 删除工作主档
            if (!wrkMastService.deleteById(wrkMast)) {
                exceptionHandle("删除工作主档[workNo={0}]失败", wrkMast.getWrkNo());
            }
            // 保存工作明细档历史档
            if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
//                exceptionHandle("保存工作明细历史档[workNo={0}]失败", wrkMast.getWrkNo());
            }
            List<WrkDetl> wrkDetls1 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrkNo", wrkMast.getWrkNo()));
            wrkDetls1.forEach( wrkDetl -> {
                WrkDetlLog wrkDetlLog = new WrkDetlLog();
                wrkDetlLog.sync(wrkDetl);
                wrkDetlLog.setModiTime(now);
                if (!wrkDetlLogService.insert(wrkDetlLog)){
                    exceptionHandle("保存工作明细历史档[workNo={0}]失败", wrkMast.getWrkNo());
                }
            });

//            if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
////                exceptionHandle("保存工作明细历史档[workNo={0}]失败", wrkMast.getWrkNo());
//            }
            // 删除工作明细档
            if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
//                exceptionHandle("删除工作明细档[workNo={0}]失败", wrkMast.getWrkNo());