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

廖井涛

2024-02-22 e4fe69941b2dd4582ec0bd82c32b8dfbc30d85b5

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

@@ -21,11 +21,11 @@
    Boolean insertFinishedOperateLogAllocate(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);

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

    Integer getselectAllocateFinishedOperateLogPageTotal(@Param("offset") Integer offset,
                                                         @Param("pageSize") Integer pageSize,
                                                         @Param("pageSize") Integer pageSize,String startDate, String endDate,
                                                         @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);

    Integer getmaximum(@Param("type") String type);
@@ -36,11 +36,21 @@
                                            @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("pageSize") Integer pageSize,String startDate, String endDate,
                                                          @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);

    Integer getSelectOperateRecordLogPageTotal(@Param("offset") Integer offset,
                                                         @Param("pageSize") Integer pageSize,
                                                         @Param("pageSize") Integer pageSize,String startDate, String endDate,
                                                         @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);

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