接口对接功能完善

pang.jiabao

昨天 259e38eb55c12b501427702d551d4de61182406c

 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;
@@ -180,7 +178,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", 3).orderBy("update_time"));
                    .in("doc_type", 3).orderBy("update_time"));
            if (orderPakin == null) {
                return;
            }
@@ -189,16 +187,59 @@
                MesInApply result = JSONObject.parseObject(orderPakin.getMemo(), MesInApply.class);
                result.setQty(orderDetl.getQty().intValue());

//                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/10 * * * * ? ")
    @Async("orderThreadPool")
    void outOrderCompleteReport() {
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {

            List<OrderPakout> orderPakoutList = orderPakoutService.selectList(new EntityWrapper<OrderPakout>().eq("settle", 4).orderBy("update_time"));
            if (orderPakoutList.size() == 0) {
                return;
            }

            for(OrderPakout orderPakout:orderPakoutList) {
                try {
                    MesOutApply mesOutApply = JSONObject.parseObject(orderPakout.getMemo(), MesOutApply.class);
                    MesOutFeedback mesOutFeedback = new MesOutFeedback();
                    mesOutFeedback.setTaskno(mesOutApply.getTaskno());
                    mesOutFeedback.setTaskname(mesOutApply.getTaskname());
                    mesOutFeedback.setProductLineId(mesOutApply.getProductLineId());
                    mesOutFeedback.setStationId(mesOutApply.getStationId());
                    mesOutFeedback.setItemno(mesOutApply.getItemno());
                    mesOutFeedback.setTuoPanId(orderPakout.getNumber());
                    mesOutFeedback.setQty(mesOutApply.getQty());
                    mesOutFeedback.setItemBarcode(mesOutApply.getItemBarcode());
                    mesOutFeedback.setOrderNo(mesOutApply.getOrderNo());

                    String url = MES_URL + "Aprs/issueComplete";
                    String response = RcsServiceImpl.sendPost(url, JSONObject.toJSONString(mesOutFeedback));
                    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());
                        }
                    }
                }catch (Exception e) {
                    log.error("出库订单上报失败,orderNo:{},exception:{}",orderPakout.getOrderNo(),e);
                }
            }
        }
    }