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

czkh

2 天以前 975823f4d07c91a67162f553be9ff4ac25f3d47d

 src/main/java/com/zy/asrs/mapper/OrderMapper.java

@@ -23,4 +23,14 @@

    Order selectOrderMoveStatus();
    Order selectOrderMoveStatusInitial();

    /**
     * 扫描出待处理，未生成入库通知档的入库单据
     */
    List<Order> selectNotGroupingList();

    /**
     * 更新订单状态和组托状态
     */
    int updateSettleAndGroupingFlag(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("account_day")Integer flag);
}