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

chenlu

2025-08-11 8bcd0cc77b0c7aa2c00ffd926ee87f1f09a3a3b5

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

@@ -279,6 +279,8 @@
               od.order_number       AS 'orderNumber',
               od.width,
               od.height,
               GREATEST(od.width, od.height) AS longSide,   -- 长边
               LEAST(od.width, od.height)   AS shortSide,   -- 短边
               od.shape,
               od.quantity,
               od.compute_gross_area,
@@ -1680,7 +1682,7 @@

    <select id="getDetailListRefund">
        select fc.order_number,
               concat(round(ogd.child_width), "*", round(ogd.child_height))   as child_width,
               concat(IF(ROUND(ogd.child_width, 1) = FLOOR(ogd.child_width), FLOOR(ogd.child_width), ROUND(ogd.child_width, 1)), "*", IF(ROUND(child_height, 1) = FLOOR(child_height), FLOOR(child_height), ROUND(child_height, 1)))   as child_width,
               sum(pl.patch_num)                                                 as quantity,
               round(ogd.total_area, 2)                                       as total_area,
               od.perimeter,
@@ -1772,7 +1774,7 @@

    <select id="getDetailListLikeRefund">
        select fc.order_number,
               concat(round(ogd.child_width), "*", round(ogd.child_height))   as child_width,
               concat(IF(ROUND(ogd.child_width, 1) = FLOOR(ogd.child_width), FLOOR(ogd.child_width), ROUND(ogd.child_width, 1)), "*", IF(ROUND(child_height, 1) = FLOOR(child_height), FLOOR(child_height), ROUND(child_height, 1)))   as child_width,
               pl.patch_num                                                   as quantity,
               round(ogd.total_area, 2)                                       as total_area,
               od.perimeter,
@@ -1982,7 +1984,7 @@
               od.processing_note                                    as processingNote,
              ogd.child_width                                as width,
               ogd.child_height                              as height,
               fc.quantity,
                #{printQuantity} as quantity,
               CONCAT(ogd.child_width  , ' X ', ogd.child_height   ,' = ',fc.quantity )           as size,
               od.order_number                                       as orderNumber,
               fc.technology_number                                  as technologyNumber,