src/main/java/com/zy/api/enums/OrderWkType.java

@@ -3,13 +3,16 @@
public enum OrderWkType {

    // 订单类型
    ORDER_WK_PUR_IN("1", "采购入库"),
    ORDER_WK_TRANSFER_IN("2", "调拔入库"),
    ORDER_WK_SALE_IN("３", "销售退货入库"),
    ORDER_WK_BAG_IN("４", "套包入库"),
    ORDER_WK_ORDER_OUT_EO("EO", "备货指示派工单（EO）"),
    ORDER_WK_ORDER_OUT_SO("SO", "备货指示派工单（SO）"),
    ORDER_WK_ORDER_OUT("14", "备货单");
    ORDER_WK_PUR_IN("0", "采购入库"),
    ORDER_WK_TRANSFER_IN("1", "调拔入库"),
    ORDER_WK_SALE_IN("2", "客户退货"),
    ORDER_WK_BAG_IN("5", "索赔入库"),
    ORDER_WK_SUPLUS_IN("7", "报溢入库"),
    ORDER_WK_PRO_UPDATE_IN("8", "件号变更入库"),
    ORDER_WK_MEGER_IN("K", "组合拆零入库"),
    ORDER_WK_ORDER_OUT_EO("11", "备货指示派工单（EO）"),
    ORDER_WK_ORDER_OUT_SO("12", "备货指示派工单（SO）"),
    ORDER_WK_ORDER_OUT("13", "备货单");

    OrderWkType(String val, String desc) {
        this.val = val;
@@ -20,7 +23,10 @@
    public String desc;

    public static String getTypeVal(String val) {
        if (val.equals(OrderWkType.ORDER_WK_PUR_IN.val)) {
        if (val.equals(OrderWkType.ORDER_WK_PUR_IN.val)
                || val.equals(OrderWkType.ORDER_WK_SUPLUS_IN.val)
                || val.equals(OrderWkType.ORDER_WK_MEGER_IN.val)
                || val.equals(OrderWkType.ORDER_WK_PRO_UPDATE_IN.val)) {
            return OrderType.ORDER_IN.type;
        } else if (val.equals(OrderWkType.ORDER_WK_TRANSFER_IN.val)) {
            return OrderType.ORDER_IN.type;

 src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java

@@ -216,6 +216,9 @@
            if (Objects.isNull(mats)) {
                throw new CoolException("物料编码不能为空！！");
            }
            if (Objects.isNull(mats.getPro_type())) {
                throw new CoolException("零件类型不能为空！！");
            }
            Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", mats.getPro_komcode()));
            if (!Objects.isNull(matnr)) {
                // 订单时间
@@ -225,7 +228,7 @@
                }
                matnr.setMaktx(mats.getPro_name());
                matnr.setSpecs(mats.getPro_size());
                matnr.setWeight(Double.parseDouble(mats.getPro_wet()));
                matnr.setWeight(Objects.isNull(mats.getPro_wet()) ? 0.0 : Double.parseDouble(mats.getPro_wet()));
                matnr.setSuppCode(mats.getPro_id());
                matnr.setTagId(MatLocType.getTag(mats.getPro_type()));
                matnr.setLocType(MatLocType.getTag(mats.getPro_type()));
@@ -277,7 +280,7 @@
        OrderParams orderParams = JSONObject.parseObject(JSONObject.toJSONString(params), OrderParams.class);
        // Order order = orderService.selectOne(new
        // EntityWrapper<Order>().eq("order_no", orderParams.getDispatch_no()));
        Order order = new Order();
        Order order = null;
        if (OrderType.ORDER_IN.type.equals(OrderWkType.getTypeVal(params.getType()))) {
            // 入库
            order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",
@@ -294,9 +297,10 @@
                order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",
                        orderParams.getDispatch_no()));
            }
        } else {
            throw new CoolException("单据类型不存在，不支持添加！！");
        }
        // 出库

        if (type.equals("add") && !Objects.isNull(order)) {
            throw new CoolException("单据已存在, 不可重复添加！！");
        }
@@ -359,6 +363,7 @@
        newOrder.setUuid(generateUUID(params));
        // 流水号（唯一）
        newOrder.setDefNumber(params.getKopen_id());
        newOrder.setTargetLocation(params.getTarget_location());
        // 箱号
        newOrder.setItemName(params.getPm_tktid());
        newOrder.setSettle(OrderSettle.ORDER_SETTLE_HOLDING.type);

 src/main/java/com/zy/asrs/entity/Order.java

@@ -79,6 +79,10 @@
    @TableField("allot_item_id")
    private Long allotItemId;

    @ApiModelProperty("目标库区")
    @TableField("target_location")
    private String targetLocation;

    /**
     * 初始票据号
     */

 src/main/java/com/zy/asrs/service/OrderService.java

@@ -1,7 +1,11 @@
package com.zy.asrs.service;

import com.zy.asrs.entity.*;
import com.zy.asrs.entity.CheckOrder;
import com.zy.asrs.entity.Order;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;

import java.util.List;


 src/main/java/com/zy/common/config/CoolExceptionHandler.java

@@ -6,6 +6,9 @@
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.method.HandlerMethod;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;

/**
 * Created by vincent on 2019-06-09
@@ -14,18 +17,35 @@
public class CoolExceptionHandler {

    @ExceptionHandler(Exception.class)
    public R handlerException(HandlerMethod handler, Exception e) {
    public Object handlerException(HandlerMethod handler, Exception e, HttpServletRequest request) {
        e.printStackTrace();
        if (useAlt(request)) {
            return altError("500", "服务器内部错误");
        }
        return R.error();
    }

    @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
    public R handleHttpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e) {
    public Object handleHttpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e,
            HttpServletRequest request) {
        if (useAlt(request)) {
            return altError("405", "HTTP方法不支持");
        }
        return R.error();
    }

    @ExceptionHandler(CoolException.class)
    public R handleRRException(CoolException e) {
    public Object handleRRException(CoolException e, HttpServletRequest request) {
        if (useAlt(request)) {
            String[] split = e.getMessage().split("-");
            String code = null;
            String msg = e.getMessage();
            if (split.length == 2 && String.valueOf(split[0]).length() < 3) {
                code = split[0];
                msg = split[1];
            }
            return altError(code, msg);
        }
        String[] split = e.getMessage().split("-");
        if (split.length == 2) {
            if (String.valueOf(split[0]).length() < 3) {
@@ -35,4 +55,29 @@
        return R.error(e.getMessage());
    }

    private boolean useAlt(HttpServletRequest request) {
        if (null == request) {
            return false;
        }
        String header = request.getHeader("X-Response-Format");
        if ("alt".equalsIgnoreCase(header)) {
            return true;
        }
        String param = request.getParameter("responseFormat");
        return "alt".equalsIgnoreCase(param);
    }

    private Map<String, Object> altError(String code, String message) {
        Map<String, Object> map = new HashMap<>();
        map.put("success", false);
        if (null != code) {
            map.put("code", code);
        } else {
            map.put("code", "200");
        }
        map.put("message", "失败");
        map.put("returnMessage", message);
        map.put("timestamp", System.currentTimeMillis());
        return map;
    }
}