#

luxiaotao1123

2022-12-14 19179e6861cbae74e5fb570c5582a720b0f267fc

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

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

import com.alibaba.fastjson.JSON;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
@@ -20,6 +22,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.util.Date;
import java.util.List;

/**
@@ -48,6 +51,15 @@
        if (null == docType) {
            return SUCCESS;
        }
        if (!Cools.isEmpty(docType.getMemo())) {
            if (docType.getMemo().equals("hand")) {
                // 修改订单状态 4.完成 ===>> 6.已上报
                if (!orderService.updateSettle(order.getId(), 6L, null)) {
                    throw new CoolException("服务器内部错误，请联系管理员");
                }
                return SUCCESS;
            }
        }
        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
        // 入库完成上报
        if (docType.getPakin() == 1) {
@@ -58,6 +70,11 @@
                    throw new CoolException(order.getOrderNo() + "订单修改State为"+state+"失败");
                } else {
                    erpService.updateTimeForVoucherDetail(order.getOrderNo());
                }

                // 修改订单状态 4.完成 ===>> 6.已上报
                if (!orderService.updateSettle(order.getId(), 6L, null)) {
                    throw new CoolException("服务器内部错误，请联系管理员");
                }

            } catch (Exception e) {
@@ -73,17 +90,24 @@
                if (!erpService.updateStateForVoucher(order.getOrderNo(), state)) {
                    throw new CoolException(order.getOrderNo() + "订单修改State为"+state+"失败");
                } else {
                    Date now = new Date();
                    for (OrderDetl orderDetl : orderDetls) {
                        VoucherDetail voucherDetail = new VoucherDetail();
                        voucherDetail.setVoucherID(order.getOrderNo());
                        voucherDetail.setPickID("fepvnn0496");
                        voucherDetail.setBarcode(orderDetl.getBatch());
                        voucherDetail.setBarcode(DateUtils.convert(now));
                        if (!erpService.insertVoucherDetail(voucherDetail)) {
                            throw new CoolException(order.getOrderNo() + "订单添加VoucherDetail"+ JSON.toJSONString(voucherDetail)+"失败");
                        }
                    }
                }

                // 修改订单状态 4.完成 ===>> 6.已上报
                if (!orderService.updateSettle(order.getId(), 6L, null)) {
                    throw new CoolException("服务器内部错误，请联系管理员");
                }

            } catch (Exception e) {
                log.error("fail", e);
                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();