自动化立体仓库 - WMS系统
zwl
2025-12-17 29d3f24dc43df41103bc5f483bfc439494a80971
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -5,9 +5,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.mes.MesInApply;
import com.zy.asrs.entity.mes.MesRecvFeedback;
import com.zy.asrs.entity.mes.MesReturn;
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;
@@ -49,6 +47,8 @@
    @Resource
    private OrderDetlPakinService orderDetlPakinService;
    @Resource
    private OrderDetlPakoutService orderDetlPakoutService;
    @Value("${mes.url}")
    public String MES_URL;
@@ -130,7 +130,7 @@
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("settle", 4)
                    .eq("doc_type",4).orderBy("update_time"));
                    .eq("doc_type",1).orderBy("update_time"));
            if (orderPakin == null) {
                return;
            }
@@ -160,7 +160,7 @@
            mesRecvFeedback.setOperuser(dbMemo.getString("operuser"));
            mesRecvFeedback.setItemdata(list);
            String url = MES_URL + "MaterialReceiptAndReturn";
            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);
@@ -173,32 +173,71 @@
        }
    }
    // 其他入库单上报
    // 配盘入库单上报
    @Scheduled(cron = "0/30 * * * * ? ")
    @Async("orderThreadPool")
    void otherInOrderCompleteReport() {
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("settle", 4)
                    .eq("doc_type", 3).orderBy("update_time"));
                    .ne("doc_type", 1).orderBy("update_time"));
            if (orderPakin == null) {
                return;
            }
            List<OrderDetlPakin> orderDetlPakins = orderDetlPakinService.selectByOrderId(orderPakin.getId());
            for (OrderDetlPakin orderDetl : orderDetlPakins) {
                MesInApply result = JSONObject.parseObject(orderPakin.getMemo(), MesInApply.class);
                result.setQty(orderDetl.getQty().intValue());
                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());
                    }
                }
//                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())) {
                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 + "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())) {
                        orderPakout.setSettle(6L);
                        orderPakoutService.updateById(orderPakout);
                        log.info("订单上报成功,orderNo={}", orderPakout.getOrderNo());
                    }
                }
            }
        }
    }