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

1

20 小时以前 9126e6315288e1ea50e74c70b099974522d6b172

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

@@ -1,6 +1,7 @@
package com.zy.asrs.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.OrderDetlPakin;
import com.zy.asrs.entity.OrderPakin;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -16,6 +17,8 @@

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

    int addToLogTable(OrderPakin order);

@@ -23,4 +26,7 @@

    OrderPakin selectOrderMoveStatus();
    OrderPakin selectOrderMoveStatusInitial();

    List<String> AllStatusSatisfyOrder(@Param("moveStatus") Integer moveStatus);
    boolean updateOrderStatus(@Param("orderNo")String orderNo);
}