1.完善出库任务呼叫agv 2.完善agv任务下发 3.等等

zwl

7 天以前 b6681bc12173c1179d0185805ba461211472ac18

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

@@ -2,12 +2,16 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.Task;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.OrderPakinServiceImpl;
import com.zy.asrs.service.impl.OrderPakoutServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.OrderInAndOutUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -38,6 +42,14 @@
    private WaitPakinLogService waitPakinLogService;
    @Autowired
    private OrderService orderService;
    @Autowired
    private TaskService taskService;
    @Autowired
    private TaskLogService taskLogService;
    @Autowired
    private OrderPakoutServiceImpl orderPakoutService;
    @Autowired
    private OrderPakinServiceImpl orderPakinService;

    @Transactional
    public ReturnT<String> start(WrkMast wrkMast) {
@@ -49,7 +61,19 @@
                while (iterator.hasNext()) {
                    WrkDetl wrkDetl = iterator.next();
                    if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                        orderService.checkComplete(wrkDetl.getOrderNo());
                        //出库单
                        if(wrkMast.getIoType()>100){
                            orderPakoutService.checkComplete(wrkDetl.getOrderNo());
                            //入库单
                        }else {
                            orderPakinService.checkComplete(wrkDetl.getOrderNo());
                        }

//                        if (wrkMast.getIoType() ==  1 || wrkMast.getIoType() == 8 ||  wrkMast.getIoType() == 54 ||  wrkMast.getIoType() == 104){
//                            OrderInAndOutUtil.checkComplete(Boolean.TRUE,wrkDetl.getOrderNo());
//                        } else {
//                            OrderInAndOutUtil.checkComplete(Boolean.FALSE,wrkDetl.getOrderNo());
//                        }
                        iterator.remove();
                    }
                }
@@ -63,11 +87,11 @@
                    if (!Cools.isEmpty(wrkMast.getBarcode())) {
                        // 保存入库通知档历史档
                        if (!waitPakinLogService.save(wrkMast.getBarcode())) {
                            exceptionHandle("保存入库通知档历史档[workNo={0}]失败", wrkMast.getWrkNo());
//                            exceptionHandle("保存入库通知档历史档[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                        // 删除入库通知档
                        if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
                            exceptionHandle("删除入库通知档[workNo={0}]失败", wrkMast.getWrkNo());
//                            exceptionHandle("删除入库通知档[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                    }
//                    // 手动入库生成单据 【 上报三方平台 】
@@ -119,4 +143,17 @@
        return SUCCESS;
    }

    @Transactional
    public ReturnT<String> AGVstart(Task task) {
        // 保存工作主档历史档
        if (!taskLogService.save(task.getWrkNo())) {
            exceptionHandle("保存工作历史档[workNo={0}]失败", task.getWrkNo());
        }
        // 删除工作主档
        if (!taskService.deleteById(task.getId())) {
            exceptionHandle("删除工作主档[workNo={0}]失败",task.getWrkNo());
        }
        return SUCCESS;
    }

}