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

zwl

6 天以前 b6681bc12173c1179d0185805ba461211472ac18

 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java

@@ -1,20 +1,31 @@
package com.zy.asrs.task;

import com.alibaba.excel.util.StringUtils;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.Order;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderService;
import com.core.common.R;
import com.zy.asrs.controller.OutController;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.mes.*;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.RcsServiceImpl;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.entity.Parameter;
import com.zy.common.model.LocDto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.util.List;
import javax.annotation.Resource;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
 * updated by IX in 2024/12/17
@@ -29,6 +40,35 @@
    private OrderService orderService;
    @Autowired
    private ApiLogService apiLogService;
    @Resource
    private OrderPakinService orderPakinService;
    @Resource
    private OrderPakoutService orderPakoutService;
    @Resource
    private MesService mesService;

    @Resource
    private OrderDetlPakinService orderDetlPakinService;
    @Resource
    private OrderDetlPakoutService orderDetlPakoutService;

    @Value("${mes.url}")
    public String MES_URL;

    @Value("${erp.switch.ErpReportOld}")
    private boolean ErpReportOld;

    @Autowired
    private LocDetlService locDetlService;

    @Autowired
    private LocMastService locMastService;

    @Autowired
    private StaDescService staDescService;

    @Autowired
    private OutController  outController;

    @Scheduled(cron = "0 0 1 * * ? ")
    public void clearApiLog() {
@@ -39,64 +79,292 @@
        }
    }

    @Scheduled(cron = "0/5 * * * * ? ")
    //    @Scheduled(cron = "0 1 * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReportOrderIssuedOnceMore() {
        List<Order> orderList = orderService.selectComplete99();
        for (Order order : orderList) {
            try {
                ReturnT<String> result = orderSyncHandler.startOrderIssuedOnceMore(order);
                if (!result.isSuccess()) {
                    log.error("单据[orderNo={}]再次转执行表失败:{}", order.getOrderNo(),result.getMsg());
                }
            } catch (Exception e){
                log.error(e.getMessage());
                log.error("单据[orderNo={}]再次转执行表失败", order.getOrderNo());
            }
        }
    }

    //    @Scheduled(cron = "0/30 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReportOrderIssued() {
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            List<Order> orderList = orderService.selectComplete1();
//        String erpReport = Parameter.get().getErpReport();
//        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
        List<Order> orderList = orderService.selectComplete1();
//            List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 1L).eq("status", 1).orderBy("create_time", true));
            for (Order order : orderList) {
                try {
                    ReturnT<String> result = orderSyncHandler.startOrderIssued(order);
                    if (!result.isSuccess()) {
                        log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
                    }
                } catch (Exception e){
                    log.error(e.getMessage());
                    log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
        for (Order order : orderList) {
            try {
                ReturnT<String> result = orderSyncHandler.startOrderIssued(order);
                if (!result.isSuccess()) {
                    log.error("单据[orderNo={}]转执行表失败", order.getOrderNo());
                }
            } catch (Exception e){
                log.error(e.getMessage());
                log.error("单据[orderNo={}]转执行表失败", order.getOrderNo());
            }
        }
//        }
    }

    @Scheduled(cron = "0/5 * * * * ? ")
    //    @Scheduled(cron = "0/5 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReportOrderInAndOutUtil() {
//        String erpReport = Parameter.get().getErpReport();
//        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
        List<Order> orders = OrderInAndOutUtil.selectComplete(null);
        for (Order order : orders) {
            try {
                ReturnT<String> result = orderSyncHandler.startOrderInAndOutUtil(order);
                if (!result.isSuccess()) {
                    log.error("单据[orderNo={}]转上报表失败", order.getOrderNo());
                }
            } catch (Exception e){
                log.error(e.getMessage());
                log.error("单据[orderNo={}]转上报表失败", order.getOrderNo());
            }
        }
//        }
    }

    // 入库订单完成上报-领料单，原材料
    @Scheduled(cron = "0/30 * * * * ? ")
    @Async("orderThreadPool")
    void inOrderCompleteReport() {
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            List<Order> orders = OrderInAndOutUtil.selectComplete(null);
            for (Order order : orders) {
                try {
                    ReturnT<String> result = orderSyncHandler.startOrderInAndOutUtil(order);
                    if (!result.isSuccess()) {
                        log.error("单据[orderNo={}]转上报表失败", order.getOrderNo());
                    }
                } catch (Exception e){
                    log.error(e.getMessage());
                    log.error("单据[orderNo={}]转上报表失败", order.getOrderNo());
            OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("settle", 4)
                    .eq("doc_type",1).orderBy("update_time"));
            if (orderPakin == null) {
                return;
            }
            String orderNo = orderPakin.getOrderNo();
            List<OrderDetlPakin> orderDetlPakins = orderDetlPakinService.selectByOrderId(orderPakin.getId());
            List<MesRecvFeedback.MesRecvFeedbackItem> list = new ArrayList<>();
            JSONObject dbMemo = JSONObject.parseObject(orderPakin.getMemo());

            for (OrderDetlPakin orderDetl : orderDetlPakins) {
                MesRecvFeedback.MesRecvFeedbackItem item = new MesRecvFeedback.MesRecvFeedbackItem();
                item.setItemNo(orderDetl.getMatnr());
                item.setOrderNo(orderNo);
                item.setQty(orderDetl.getAnfme().intValue());
                item.setRealQty(orderDetl.getAnfme().intValue());
                // 回传托盘绑定的零件二维码
                String itemBarcode = orderDetl.getStandby1();
                List<String> itemBarCodeList = new ArrayList<>();
                Matcher matcher = Pattern.compile("\"([^\"]*)\"").matcher(itemBarcode);
                while (matcher.find()) {
                    itemBarCodeList.add(matcher.group(1));
                }
                item.setItemBarcode(itemBarCodeList);
                list.add(item);
            }
            MesRecvFeedback mesRecvFeedback = new MesRecvFeedback();
            mesRecvFeedback.setSourceNo(dbMemo.getString("sourceNo"));
            mesRecvFeedback.setOperuser(dbMemo.getString("operuser"));
            mesRecvFeedback.setItemdata(list);

            String url = MES_URL + "ActualInventoryFeedback";
            String response = RcsServiceImpl.sendPost(url, JSONObject.toJSONString(mesRecvFeedback));
            if (!StringUtils.isEmpty(response) && response.contains("Success")) {
                MesReturn mesReturn = JSONObject.parseObject(response, MesReturn.class);
                if ("1".equals(mesReturn.getSuccess())) {
                    orderPakin.setSettle(6L);
                    orderPakinService.updateById(orderPakin);
                    log.info("订单上报成功，orderNo={}", orderNo);
                }
            }
        }
    }

    @Scheduled(cron = "0/5 * * * * ? ")
    // 配盘入库单上报
    @Scheduled(cron = "0/30 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReportOrderReport() {
    void otherInOrderCompleteReport() {
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            List<Order> orders = orderService.selectComplete();
            for (Order order : orders) {
                try {
                    ReturnT<String> result = orderSyncHandler.startOrderReport(order);
                    if (!result.isSuccess()) {
                        log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
            OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().ne("doc_type",1).eq("settle", 4)
                    .ne("doc_type", 1).orderBy("update_time"));
            if (orderPakin == null) {
                return;
            }
            List<OrderDetlPakin> orderDetlPakins = orderDetlPakinService.selectByOrderId(orderPakin.getId());
            for (OrderDetlPakin orderDetl : orderDetlPakins) {
                MesOutApply result = JSONObject.parseObject(orderPakin.getMemo(), MesOutApply.class);
                for(MesOutApply.MesOutApplyItem mes:result.getItemdata()){
                    if (orderDetl.getMatnr().equals(mes.getItemno())){
                        mes.setWmsBarcode(orderDetl.getBarcode());
                        mes.setRackNumber(orderDetl.getSku());
                    }
                } catch (Exception e) {
                    log.error(e.getMessage());
                    log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
                }

                String url = MES_URL + "loadComplete";
                String response = RcsServiceImpl.sendPost(url, JSONObject.toJSONString(result));
                if (!StringUtils.isEmpty(response) && response.contains("Success")) {
                    MesReturn mesReturn = JSONObject.parseObject(response, MesReturn.class);
                    if ("1".equals(mesReturn.getSuccess())) {
                        orderPakin.setSettle(6L);
                        orderPakinService.updateById(orderPakin);
                        log.info("订单上报成功，orderNo={}", orderPakin.getOrderNo());
                    }
                }
            }
        }
    }

    // 出库单上报
    @Scheduled(cron = "0/30 * * * * ? ")
    @Async("orderThreadPool")
    void otherOutOrderCompleteReport() {
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            OrderPakout orderPakout = orderPakoutService.selectOne(new EntityWrapper<OrderPakout>().eq("settle", 4).orderBy("update_time"));
            if (orderPakout == null) {
                return;
            }
            List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectByOrderId(orderPakout.getId());
            for (OrderDetlPakout orderDetl : orderDetlPakouts) {
                MesOutApply result = JSONObject.parseObject(orderPakout.getMemo(), MesOutApply.class);
                for(MesOutApply.MesOutApplyItem mes:result.getItemdata()){
                    if (orderDetl.getMatnr().equals(mes.getItemno())){
                        mes.setWmsBarcode(orderDetl.getBarcode());
                        mes.setRackNumber(orderDetl.getSku());
                    }
                }

                String url = MES_URL + "issueCompleteFit";
                String response = RcsServiceImpl.sendPost(url, JSONObject.toJSONString(result));
                if (!StringUtils.isEmpty(response) && response.contains("Success")) {
                    MesReturn mesReturn = JSONObject.parseObject(response, MesReturn.class);
                    if ("1".equals(mesReturn.getSuccess())) {
                        orderPakout.setSettle(6L);
                        orderPakoutService.updateById(orderPakout);
                        log.info("订单上报成功，orderNo={}", orderPakout.getOrderNo());
                    }
                }
            }
        }
    }

    // 出库单上报
    @Scheduled(cron = "0/30 * * * * ? ")
    @Async("orderThreadPool")
    void AutoOutOrderPinOut() throws InterruptedException {
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            List<OrderPakout> orderPakouts = orderPakoutService.selectList(new EntityWrapper<OrderPakout>()
                    .eq("settle", 1)
                    .eq("doc_type", 12)
                    .orderBy("update_time"));
            if (orderPakouts.isEmpty()) {
                return;
            }
            for (OrderPakout orderPakout : orderPakouts) {
                List<LocDto> locDtos = new ArrayList<>();
                Boolean boo = false;

                Set<String> exist = new HashSet<>();
                List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderPakout.getOrderNo()));

                for (OrderDetlPakout orderDetl : orderDetlPakouts) {
                    double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
                    if (issued <= 0.0D) {
                        continue;
                    }

                    List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, orderDetl.getMatnr(), orderDetl.getBatch(),
                            orderDetl.getBrand(), orderPakout.getDocType() == 11 ? null : orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
                    for (LocDetl locDetl : locDetls) {
                        if (issued > 0) {
                            LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
                                    issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
                            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
                            locDto.setFrozen(locDetl.getFrozen());
                            locDto.setFrozenLoc(locMast.getFrozen());
                            List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
                            locDto.setStaNos(staNos);
                            locDto.setBrand(orderDetl.getBrand());

                            locDto.setStandby1(orderDetl.getStandby1());
                            locDto.setStandby2(orderDetl.getStandby2());
                            locDto.setStandby3(orderDetl.getStandby3());
                            locDto.setBoxType1(orderDetl.getBoxType1());
                            locDto.setBoxType2(orderDetl.getBoxType2());
                            locDto.setBoxType3(orderDetl.getBoxType3());
                            locDtos.add(locDto);
                            exist.add(locDetl.getLocNo());
                            // 剩余待出数量递减
                            issued = issued - locDetl.getAnfme();
                        } else {
                            break;
                        }
                    }
                    if (issued > 0) {
                        boo = true;
                        continue;
                    }

                }
                if (boo){
                    continue;
                }
                R pakout = outController.pakout(locDtos);
                break;
            }

        }
    }

    //    @Scheduled(cron = "0/30 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReportOrderReport() {

//        // 入库完成
//        List<OrderPakin> pakins = orderPakinService.selectComplete();
//        for (OrderPakin orderPakin : pakins) {
//            try {
//                 mesService.inFeedback(orderPakin.getOrderNo());
//            } catch (Exception e) {
//                log.error("推送入库完成信息错误, order{}", orderPakin, e);
//            }
//        }

//        List<OrderPakout> pakouts = orderPakoutService.selectComplete();
//        for (OrderPakout orderPakout : pakouts) {
//            try {
//                mesService.outFeedback(orderPakout.getOrderNo());
//            } catch (Exception e) {
//                log.error("推送出库完成信息错误, order{}", orderPakout, e);
//            }
//        }

//        if (!ErpReportOld){
//            return;
//        }
//        String erpReport = Parameter.get().getErpReport();
//        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
//            List<Order> orders = orderService.selectComplete();
//            for (Order order : orders) {
//                try {
//                    ReturnT<String> result = orderSyncHandler.startOrderReport(order);
//                    if (!result.isSuccess()) {
//                        log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
//                    }
//                } catch (Exception e) {
//                    log.error(e.getMessage());
//                    log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
//                }
//            }
//        }
    }
}