#

ytfl

9 天以前 a516fec01d3af6fbd55fb8ec1177ff55f5b0f156

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

@@ -15,6 +15,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;

@@ -39,6 +40,8 @@
    private WaitPakinLogService waitPakinLogService;
    @Autowired
    private OrderService orderService;
    @Autowired
    private ReportToThirdService reportToThirdService;

    @Transactional
    public ReturnT<String> start(WrkMast wrkMast) {
@@ -67,6 +70,16 @@
                if (wrkMast.getIoType() == 1) {
                    // 入库通知单
                    if (!Cools.isEmpty(wrkMast.getBarcode())) {
                        WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
                        if (waitPakin != null) {
                            if (!Cools.isEmpty(waitPakin.getTkFlag())) {
                                boolean result = reportToThirdService.reportTkrk(waitPakin);
                                if (!result) {
                                    exceptionHandle("退库入库上报ERP[workNo={0}]失败", wrkMast.getWrkNo());
                                }
                            }
                        }

                        // 保存入库通知档历史档
                        if (!waitPakinLogService.save(wrkMast.getBarcode())) {
//                            exceptionHandle("保存入库通知档历史档[workNo={0}]失败", wrkMast.getWrkNo());
@@ -100,6 +113,9 @@
//                }
            }

            wrkMast.setIoTime(new Date());
            wrkMastService.updateById(wrkMast);

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