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

chenlu

2024-02-20 6965db086df978e46e0a1bd7227b981ad48a9b1c

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

@@ -36,6 +36,12 @@
                                            @Param("operateType") String operateType,
                                            @Param("remarks") String remarks);

    Boolean insertFinishedOperateLogRework(@Param("orderDetail") OrderDetail orderDetail,
                                            @Param("userName") String userName,
                                            @Param("oddNumber") String oddNumber,
                                            @Param("operateType") String operateType,
                                            @Param("remarks") String remarks);

    List<OrderDetail> getSelectOperateRecord(@Param("offset") Integer offset,
                                                          @Param("pageSize") Integer pageSize,
                                                          @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
@@ -43,4 +49,8 @@
    Integer getSelectOperateRecordLogPageTotal(@Param("offset") Integer offset,
                                                         @Param("pageSize") Integer pageSize,
                                                         @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);

    Boolean updateToExamine(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog,
                                           @Param("userName") String userName,
                                            @Param("type") String type);
}