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

chenlu

2025-03-13 40749f46655201fae0091612ed4fec0b3d2e854b

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

 north-glass-erp/northglass-erp/src/stores/sd/order/orderInfo.js

@@ -63,7 +63,17 @@
            }
            this.selectProcessCardFilter={
                list:[],
                data:{}
                data:{
                    order: {
                        project: ''
                    },
                    orderDetail: {
                        productId: '',
                        productName: '',
                        computeGrossArea: '',
                        processingNote: '',
                    }
                }
            }
        }
    },

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

@@ -174,7 +174,7 @@
        on a.order_id = b.order_id and a.order_number = b.order_number
        where a.order_id = #{orderId}
          and a.order_number = #{orderNumber}
          and a.child_width != b.width
          and(a.child_width != b.width or a.child_height != b.height)
        ) as c
    </select>