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

chenlu

2025-07-18 f268121e9fe9116c19f84412b3ea992d68acf542

 north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml

@@ -28,7 +28,8 @@
                            weight,
                            perimeter,
                            monolithic_perimeter,
                            other_columns
                            other_columns,
                            file_name
                          )
        values
        <foreach collection ="orderDetails" item="orderDetail" separator =",">
@@ -55,7 +56,8 @@
            #{orderDetail.weight},
            #{orderDetail.perimeter},
            #{orderDetail.monolithicPerimeter},
            #{orderDetail.otherColumns}
            #{orderDetail.otherColumns},
            #{orderDetail.fileName}
             )
        </foreach>
    </insert>
@@ -1066,7 +1068,9 @@
        group by od.product_id,pd.detail
    </select>


    <delete id="deleteOrderFile" >
        delete from sd.order_file where order_id = #{orderId}
    </delete>