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

1

20 小时以前 9126e6315288e1ea50e74c70b099974522d6b172

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

@@ -5,6 +5,7 @@
import com.zy.asrs.entity.OrderDetlPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.OrderDetlByCode;

import java.util.List;

@@ -26,6 +27,8 @@

    List<OrderPakin> selectComplete();
    List<OrderPakin> selectComplete8();
    List<OrderPakin> selectComplete9();
    List<OrderPakin> selectComplete10();

    boolean addToLogTable(OrderPakin order);

@@ -34,4 +37,9 @@
    OrderPakin selectOrderMoveStatus();
    OrderPakin selectOrderMoveStatusInitial();

    List<String> AllStatusSatisfyOrder(Integer moveStatus);

    boolean updateOrderStatus(String orderNo);


}