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

guoyujie

2025-12-10 1750abd11320f8d09ffe1580b7467dba87c86c89

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

@@ -62,6 +62,9 @@
                                           @Param("userName") String userName,
                                            @Param("type") String type);

    Boolean updateFinishedOperateLogQuantity(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog
            ,@Param("deliveryDetailMoney") Double deliveryDetailMoney,@Param("deliveryDetailArea") Double deliveryDetailArea);

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


@@ -85,7 +88,8 @@

    List<FinishedOperateLogDTO> exportFinishedOperateLogReport(List<LocalDate> dates,String type);

    Boolean insertOrderFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);
    Boolean insertOrderFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,
                                          @Param("oddNumber") String oddNumber,@Param("processId") String processId);

    Boolean updateOrderFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);

@@ -104,4 +108,5 @@
    List<Map<String, Object>> getDetailLists(String orderId, String remarks, Integer productId,String thickness);

    List<Map<String, Object>> getDetailList2(String orderId, String processId, String remarks);

}