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

guoyuji

2024-10-30 f2b7487e3722ce3218a8e23a6ac18c1b78fe6a2c

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

 north-glass-erp/northglass-erp/src/stores/sd/companySet/Ìì½ò±±²£.js

@@ -16,7 +16,7 @@
        deliveryIdType:'day',
        columnName:'图号',
        selectOrderReviewShow:true, //订单首页加工单审核按钮是否显示
        productName:"product_name",
        productName:"product_name",//产品创建查重字段
        decValue:3,//订单保留位数，天津3位,常州2位
        label:1,//标签类型
        calculateType:1,//订单计算方式

 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml

@@ -516,13 +516,14 @@
                                          ogds.glass_child                                  AS concatenated_glass_child,
                                          process                                           AS processed_part,
                                          ogds.child_width,
                                          ogds.child_height
                                          ogds.child_height,
                                          ogds.group
                                   from sd.order_glass_detail as ogds
                                   where ogds.order_id = #{orderId}
                                   GROUP BY order_id, order_number, ogds.glass_child, process) as ogdss
                                   GROUP BY order_id, order_number, ogds.glass_child, process,ogds.group) as ogdss
                                  on fc.order_id = ogdss.order_id and ogdss.order_number = fc.order_number
               where fc.order_id = #{orderId}
               GROUP BY fc.process_id, ogdss.concatenated_glass_child, ogdss.processed_part
               GROUP BY fc.process_id, ogdss.concatenated_glass_child, ogdss.processed_part,ogdss.group
               order by fc.process_id, ogdss.technology_number)

              UNION