Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

skyouc

6 小时以前 9279bad9ac573542041e3a3e0664b207d3c398b4

Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

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

@@ -37,7 +37,7 @@
        } else if (val.equals(OrderWkType.ORDER_WK_ORDER_OUT_EO.val)  || val.equals(OrderWkType.ORDER_WK_ORDER_OUT_SO.val)  || val.equals(OrderWkType.ORDER_WK_ORDER_OUT.val)) {
            return OrderType.ORDER_OUT.type;
        } else {
            return OrderType.ORDER_OUT.type;
            return null;
        }
    }


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

@@ -324,6 +324,8 @@
                // 备货指示派工单（EO/SO）出库
                order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",
                        orderParams.getDispatch_no()));
            } else {
                throw new CoolException("单据类型不存在，不支持添加！！");
            }
        } else {
            throw new CoolException("单据类型不存在，不支持添加！！");