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

zc

2024-11-01 797fce4ad48f7b70dc08766068b64f35ee9d4775

 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);
}