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

lty

3 天以前 84edd2b6308fa018eab932a2db528b7e6e1e6d13

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

@@ -12,6 +12,8 @@

    OrderPakin selectByNo(String orderNo);

    List<OrderPakin> selectBySettle(Long settle);

    List<OrderDetlPakin> selectWorkingDetls(Long orderId);

    boolean updateSettle(Long orderId, Long settle, Long userId);
@@ -32,4 +34,8 @@
    OrderPakin selectOrderMoveStatus();
    OrderPakin selectOrderMoveStatusInitial();

    List<String> AllStatusSatisfyOrder(Integer moveStatus);

    boolean updateOrderStatus(String orderNo);

}