no message

skyouc

5 天以前 08915b05c42b2ba97a8bb0809aeb48802ae63b46

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

@@ -1,6 +1,7 @@
package com.zy.asrs.task.handler;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
@@ -19,9 +20,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.enums.OrderTypeEnum;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.TaskDetlLogServiceImpl;
import com.zy.asrs.service.impl.TaskDetlServiceImpl;
import com.zy.asrs.service.impl.WrkDetlLogServiceImpl;
import com.zy.asrs.service.impl.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.OrderInAndOutUtil;
@@ -75,7 +74,13 @@
    @Autowired
    private TaskDetlLogService taskDetlLogService;
    @Autowired
    private WrkDetlLogServiceImpl wrkDetlLogService;
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private OrderDetlPakoutService orderDetlPakoutService;
    @Autowired
    private OrderPakoutService orderPakoutService;


    @Transactional
@@ -281,13 +286,13 @@
                if (Objects.isNull(material)) {
                    throw new CoolException(material.getMatnr() +  "物料不存在");
                }
                ReportOrderParams itemParam = new ReportOrderParams();

                LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
                List<WrkDetlLog> wrkDetls = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>()
                        .eq("matnr", detl.getMatnr())
                        .eq("three_code", detl.getThreeCode())
                        .eq("supp_code", detl.getSuppCode())
                        .eq("order_no", detl.getOrderNo()));
                if (Objects.isNull(locDetl)) {
                if (Objects.isNull(wrkDetls) || wrkDetls.isEmpty()) {
                    ReportOrderParams itemParam = new ReportOrderParams();
                    // BS Code
                    itemParam.setTotal_serial(detl.getThreeCode())
                            // 上报时，默认产品类型是null
@@ -307,7 +312,10 @@
                            .setDamage_qty(0)
                            // 上报时，默认差异数量是0
                            .setDiff_qty(0);
                    reportOrderParams.add(itemParam);
                } else {
                    wrkDetls.forEach(wrkDetl -> {
                        ReportOrderParams itemParam = new ReportOrderParams();
                    // BS Code
                    itemParam.setTotal_serial(detl.getThreeCode())
                            // 上报时，默认产品类型是null
@@ -316,21 +324,22 @@
                            .setPro_komcode(detl.getMatnr())
                            // 上报时，默认产品id是供应商编码
                            .setPro_id(detl.getSuppCode())
                            .setLocation_no(locDetl.getZpallet())
                            .setSj_emp(locDetl.getModiUser$())
                                .setLocation_no(wrkDetl.getZpallet())
                                .setSj_emp(wrkDetl.getModiUser$())
                            .setLocation_type(MatLocType.getMatTag(material.getTagId() + ""))
                            // 上报时，默认上报时间是更新时间
                            .setSj_date(Utils.dateToStr(order.getUpdateTime(), "yyyy-MM-dd HH:mm:ss"))
                            // 上报时，默认上报数量是订单数量
                            .setPick_qty(locDetl.getAnfme().intValue())
                                .setPick_qty(wrkDetl.getAnfme().intValue())
//                                .setPick_qty(detl.getQty().intValue())
                            // 上报时，默认损坏数量是0
                            .setDamage_qty(0)
                            // 上报时，默认差异数量是0
                            .setDiff_qty(0);
                }
                reportOrderParams.add(itemParam);
            });

                }
            });
            orderParam.setDetails(reportOrderParams);

            XSR response = null;
@@ -391,25 +400,27 @@
                if (Objects.isNull(material)) {
                    throw new CoolException(material.getMatnr() +  "物料不存在");
                }
                TaskDetlLog detlLog = taskDetlLogService.selectOne(new EntityWrapper<TaskDetlLog>()
                TaskDetlLog taskDetlLog = taskDetlLogService.selectOne(new EntityWrapper<TaskDetlLog>()
                        .eq("matnr", detl.getMatnr())
                        .eq("supp_code", detl.getStandby1())
                        .eq("order_no", detl.getOrderNo()));
                if (Objects.isNull(detlLog)) {
                    throw new CoolException("数据错误 ，请检查AGV任务档是否已完成！！");
                if (Objects.isNull(taskDetlLog) || Objects.isNull(taskDetlLog.getAreaType())) {
                    orderParam.setTarget_location("2");
//                    throw new CoolException("数据错误 ，请检查AGV任务档是否已完成！！");
                } else {
                    orderParam.setTarget_location(taskDetlLog.getAreaType());
                }
/*                WrkDetlLog detlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>()
                List<WrkDetlLog> detlLog = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>()
                        .eq("matnr", detl.getMatnr())
                        .eq("supp_code", detl.getStandby1())
                        .eq("order_no", detl.getOrderNo()));
                if (Objects.isNull(detlLog)) {
                    throw new CoolException("物料编码：" + detl.getMatnr() + "数据错误 ，请检查堆垛机任务档是否已完成！！");
                }*/
                //目标库区
//                orderParam.setTarget_location("2");
                orderParam.setTarget_location(detlLog.getAreaType());
                detlLog.forEach(item -> {
                OrderItemsParam itemParam = new OrderItemsParam();
                // BS Code
                    if (Objects.isNull(item)) {
                        itemParam.setLocation_no("LX99999999");
                    } else {
                        itemParam.setLocation_no(item.getZpallet());
                    }
                itemParam
                        // 上报时，默认产品类型是null
                        .setPro_type(material.getProType())
@@ -418,12 +429,17 @@
                        // 上报时，默认产品id是供应商编码
                        .setPro_id(detl.getSuppCode())
//                        // 上报时，默认来源位置是null
                        .setLocation_no(detlLog.getZpallet())
//                              .setLocation_no(detlLog.getZpallet())
                        // 上报时，默认上报数量是订单数量
                        .setPick_qty(Objects.isNull(detl.getQty()) ? 0 : detl.getQty().intValue());
                            .setPick_qty(item.getAnfme().intValue());
//                            .setPick_qty(Objects.isNull(detl.getQty()) ? 0 : detl.getQty().intValue());
                reportOrderParams.add(itemParam);
            });
            });

            //目标库区
//          orderParam.setTarget_location("2");
            // BS Code
            if (orderParam.getTarget_location().equals("2")) {
                orderParam.setType("11");
            } else if (orderParam.getTarget_location().equals("3")) {
@@ -438,11 +454,10 @@
            try {
                List<ReportOrderParam> orderParams = new ArrayList<>();
                orderParams.add(orderParam);
                log.info("派工单入参---------->{}", JSONArray.toJSONString(orderParams));
                if (order.getReportOnce() < 4) {
                    response = kopenApiService.reportOutDetailsResult(orderParams, order);
                } else {
                    return FAIL;
                }
                    if (!Objects.isNull(response)) {
                if (response.getSuccess()) {
                    success = true;
                    // 修改订单状态 4.完成 ===>> 6.已上报
@@ -455,9 +470,13 @@
                            JSON.toJSONString(orderParams), JSON.toJSONString(response));
                    throw new CoolException("上报KOPEN系统失败");
                }
                    } else {
//                            return SUCCESS;
                    }
                }
            } catch (Exception e) {
                log.error("fail", e);
                return FAIL.setMsg(e.getMessage());
//                        return FAIL.setMsg(e.getMessage());
            } finally {
                try {
                    // 保存接口日志
@@ -492,13 +511,14 @@
                if (Objects.isNull(material)) {
                    throw new CoolException(material.getMatnr() +  "物料不存在");
                }
                TaskDetlLog detlLog = taskDetlLogService.selectOne(new EntityWrapper<TaskDetlLog>()
                List<TaskDetlLog> detlLogs = taskDetlLogService.selectList(new EntityWrapper<TaskDetlLog>()
                        .eq("matnr", detl.getMatnr())
                        .eq("supp_code", detl.getStandby1())
                        .eq("order_no", detl.getOrderNo()));
                if (Objects.isNull(detlLog)) {
                if (Objects.isNull(detlLogs) || detlLogs.isEmpty()) {
                    throw new CoolException("数据错误 ，请检查AGV任务档是否已完成！！");
                }
                detlLogs.forEach(detlLog -> {
                OrderItemsParam itemParam = new OrderItemsParam();
                // 上报时，默认产品类型是null
                itemParam.setPro_type(material.getProType());
@@ -509,9 +529,10 @@
                //todo 台车编码
                itemParam.setTruck_no(detlLog.getZpallet());
                // 上报时，默认上报时间是更新时间
                itemParam.setPick_qty(detl.getQty().intValue());
                    itemParam.setPick_qty(detlLog.getAnfme().intValue());

                reportOrderParams.add(itemParam);
                });
            });
            pubOrderParams.setPartList(reportOrderParams);

@@ -633,4 +654,38 @@

    }

    @Transactional(rollbackFor = Exception.class)
    public ReturnT<String> startConvertOrders(OrderPakout orderPakout) {
        if (orderPakout.getSettle() != 4) {
            return FAIL;
        }
        List<OrderDetlPakout> detlPakins = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderPakout.getOrderNo()));
        if (!Objects.isNull(detlPakins) && !detlPakins.isEmpty()) {
            detlPakins.forEach(detl -> {
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
                        .eq("matnr", detl.getMatnr())
                        .eq("supp_code", detl.getSuppCode())
                        .eq("order_no", detl.getOrderNo()));
                if (!Objects.isNull(orderDetl)) {
                    orderDetl.setQty(detl.getQty());
                    orderDetl.setWorkQty(detl.getWorkQty());
                    if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>()
                            .eq("matnr", detl.getMatnr())
                            .eq("supp_code", detl.getSuppCode())
                            .eq("order_no", detl.getOrderNo()))) {
                        throw new CoolException("订单信息更新失败！！");
                    }
                }
            });

            Order orderNo = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderPakout.getOrderNo()));
            if (!Objects.isNull(orderNo)) {
                orderNo.setSettle(4L);
                if (!orderService.update(orderNo, new EntityWrapper<Order>().eq("order_no", orderPakout.getOrderNo()))) {
                    throw new CoolException("单据状态更新失败！！");
                }
            }
        }
        return SUCCESS;
    }
}