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

wang..123

2022-02-18 4901728f970314cddd9fa167cf3d3fb9476208e5

 src/main/java/com/zy/ints/task/handler/WaitMatinLogHandler.java

@@ -1,5 +1,6 @@
package com.zy.ints.task.handler;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.ints.entity.WaitMatin;
@@ -25,14 +26,14 @@
    @Transactional
    public ReturnT<String> start(WaitMatin waitMatin){
        try {
            // 保存工作主档历史档
//            if (!WaitMatinLogService.save(waitMatin.getBillNo(),waitMatin.getSeqNo())) {
//                exceptionHandle("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());
//            }
//            // 删除工作主档
//            if (!wrkMastService.deleteById(wrkMast)) {
//                exceptionHandle("删除工作主档[workNo={0}]失败", wrkMast.getWrkNo());
//            }
            // 保存入库通知历史档
            if (!waitMatinLogService.save(waitMatin.getBillNo(),waitMatin.getSeqNo())) {
                exceptionHandle("保存入库通知历史档[billNo={0},seqNo={1}]失败", waitMatin.getBillNo(),waitMatin.getSeqNo());
            }
            // 删除入库通知档
            if (!waitMatinService.delete(new EntityWrapper<WaitMatin>().eq("bill_no", waitMatin.getBillNo()).eq("seq_no", waitMatin.getSeqNo()))) {
                exceptionHandle("删除入库通知档[billNo={0},seqNo={1}]失败", waitMatin.getBillNo(),waitMatin.getSeqNo());
            }
        } catch (Exception e) {
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();