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

廖井涛

2025-10-23 df143921e8ec85b43420b71961d73825521911d1

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

@@ -21,7 +21,8 @@
                                        @Param("oddNumber") String oddNumber, @Param("container") String container,
                                        @Param("deliveryDetailMoney") Double deliveryDetailMoney,
                                        @Param("deliveryDetailArea") Double deliveryDetailArea,
                                        String createTime);
                                        String createTime,
                                        @Param("getComputeArea") Double getComputeArea);

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

@@ -103,4 +104,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);

}