Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-03-29 d3475019350136c3946afcb3a831a5444e97bc17

 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java

@@ -56,4 +56,13 @@
                                            @Param("type") String type);

    Boolean updateFinishedOperateLogState(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog,@Param("type") String type);


    List<OrderDetail> getSelectStorageRecord(@Param("offset") Integer offset,
                                             @Param("pageSize") Integer pageSize,String startDate, String endDate,String type,
                                             @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);

    Map<String,Integer> getSelectStorageRecordLogPageTotal(@Param("offset") Integer offset,
                                                           @Param("pageSize") Integer pageSize,String startDate, String endDate,String type,
                                                           @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
}