3077,3106只有合格能出,2041 只有待判能出

pang.jiabao

6 天以前 e012a72a5660566d698c93ca4f29b6e5ffe997b0

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

@@ -2,9 +2,8 @@

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.mapper.OrderDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -14,6 +13,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import javax.annotation.Resource;
import java.util.Iterator;
import java.util.List;

@@ -38,6 +38,13 @@
    private WaitPakinLogService waitPakinLogService;
    @Autowired
    private OrderService orderService;
    @Autowired
    private WrkMastStaService wrkMastStaService;
    @Autowired
    private WrkMastStaLogService wrkMastStaLogService;

    @Resource
    private OrderDetlMapper orderDetlMapper;

    @Transactional
    public ReturnT<String> start(WrkMast wrkMast) {
@@ -60,16 +67,18 @@
                // 全板入库
                if (wrkMast.getIoType() == 1) {
                    // 入库通知单
                    if (!Cools.isEmpty(wrkMast.getBarcode())) {
                        // 保存入库通知档历史档
                        if (!waitPakinLogService.save(wrkMast.getBarcode())) {
                            exceptionHandle("保存入库通知档历史档[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                        // 删除入库通知档
                        if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
                            exceptionHandle("删除入库通知档[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                    }
//                    if (!Cools.isEmpty(wrkMast.getBarcode())) {
//                        // 保存入库通知档历史档
//                        if (!waitPakinLogService.save(wrkMast.getBarcode())) {
////                            exceptionHandle("保存入库通知档历史档[workNo={0}]失败", wrkMast.getWrkNo());
//                            log.error("保存入库通知档历史档[workNo={"+wrkMast.getWrkNo()+"}]失败");
//                        }
//                        // 删除入库通知档
//                        if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
////                            exceptionHandle("删除入库通知档[workNo={0}]失败", wrkMast.getWrkNo());
//                            log.error("删除入库通知档[workNo={"+wrkMast.getWrkNo()+"}]失败");
//                        }
//                    }
//                    // 手动入库生成单据 【 上报三方平台 】
//                    if (!Cools.isEmpty(wrkDetls)) {
//                        if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
@@ -86,12 +95,19 @@
                }

            // 出库 --------------------------------------------------------------------------------
            } else if (wrkMast.getWrkSts() == 15) {
//                if (!Cools.isEmpty(wrkDetls)) {
//                    if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
//                        exceptionHandle("生成手动出库单据[workNo={0}]失败", wrkMast.getWrkNo());
//                    }
//                }
            } else if (wrkMast.getWrkSts() == 15 && wrkMast.getIoType() != 110 &&wrkMast.getIoType() != 3) {
                List<WrkDetl> wrkDetls101 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
                if (wrkDetls101.isEmpty()) {
//                        exceptionHandle("全板出库 ===>> 工作明细档为空；[workNo={0}]", wrkMast.getWrkNo());
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    return FAIL.setMsg("全板出库 ===>> 工作明细档为空; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
                }
                for (WrkDetl wrkDetl : wrkDetls101) {
                    if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                        // 更新订单完成数量
                        orderDetlMapper.updateOrderDetlQtyByGroupNo(wrkDetl.getOrderNo(), wrkDetl.getBrand());
                    }
                }
            }

            // 保存工作主档历史档
@@ -102,14 +118,19 @@
            if (!wrkMastService.deleteById(wrkMast)) {
                exceptionHandle("删除工作主档[workNo={0}]失败", wrkMast.getWrkNo());
            }
            if ((wrkMast.getIoType()<200 || wrkMast.getWrkSts().equals(57L)) && !Cools.isEmpty(wrkDetls)){
            List<WrkDetl> wrkDetls2 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
            if ((wrkMast.getIoType()<200 || wrkMast.getWrkSts().equals(57L)) && !Cools.isEmpty(wrkDetls2)){
                // 保存工作明细档历史档
                if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
                    exceptionHandle("保存工作明细历史档[workNo={0}]失败", wrkMast.getWrkNo());
//                    exceptionHandle("保存工作明细历史档[workNo={0}]失败", wrkMast.getWrkNo());
                    log.error("保存工作明细历史档[workNo={"+wrkMast.getWrkNo()+"}]失败");

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

                }
            }
        } catch (Exception e) {
@@ -121,4 +142,26 @@
        return SUCCESS;
    }

    @Transactional
    public ReturnT<String> start(WrkMastSta wrkMastSta) {
        try {
            WrkMastStaLog wrkMastStaLog = new WrkMastStaLog();
            wrkMastStaLog.sync(wrkMastSta);
            // 保存工作主档历史档
            if (!wrkMastStaLogService.insert(wrkMastStaLog)) {
                exceptionHandle("保存工作历史档[workNo={0}]失败", wrkMastSta.getWrkNo());
            }
            // 删除工作主档
            if (!wrkMastStaService.deleteById(wrkMastSta)) {
                exceptionHandle("删除工作主档[workNo={0}]失败", wrkMastSta.getWrkNo());
            }
        } catch (Exception e) {
            log.error("fail", e);
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setMsg(e.getMessage());
        }
        return SUCCESS;
    }

}