Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

1

21 小时以前 9126e6315288e1ea50e74c70b099974522d6b172

 src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java

@@ -114,6 +114,17 @@
        }

        @Transactional
        public List<Order> selectComplete9() {
            List<OrderPakin> orderPakinList = orderPakinService.selectComplete9();
            return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList);
        }
        @Transactional
        public List<Order> selectComplete10() {
            List<OrderPakin> orderPakinList = orderPakinService.selectComplete10();
            return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList);
        }

        @Transactional
        public List<Order> selectComplete8() {
            List<OrderPakin> orderPakinList = orderPakinService.selectComplete8();
            return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList);
@@ -280,6 +291,16 @@
            List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete8();
            return OrderTransFormationUtil.transformationOrderListPakout(orderPakoutList);
        }
        @Transactional
        public List<Order> selectComplete9() {
            List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete9();
            return OrderTransFormationUtil.transformationOrderListPakout(orderPakoutList);
        }
        @Transactional
        public List<Order> selectComplete10() {
            List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete10();
            return OrderTransFormationUtil.transformationOrderListPakout(orderPakoutList);
        }

        @Transactional
        public boolean addToLogTableOrder(Order order) {
@@ -436,6 +457,18 @@
            List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete8();
            return OrderTransFormationUtil.transformationOrderList(orderPakinList,orderPakoutList);
        }
        @Transactional
        public List<Order> selectComplete9() {
            List<OrderPakin> orderPakinList = orderPakinService.selectComplete9();
            List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete9();
            return OrderTransFormationUtil.transformationOrderList(orderPakinList,orderPakoutList);
        }
        @Transactional
        public List<Order> selectComplete10() {
            List<OrderPakin> orderPakinList = orderPakinService.selectComplete10();
            List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete10();
            return OrderTransFormationUtil.transformationOrderList(orderPakinList,orderPakoutList);
        }

        @Transactional
        public boolean addToLogTableOrder(Order order) {
@@ -544,6 +577,8 @@
    public abstract List<Order> selectComplete();

    public abstract List<Order> selectComplete8();
    public abstract List<Order> selectComplete9();
    public abstract List<Order> selectComplete10();

    public abstract boolean addToLogTableOrder(Order order);