Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyujie

2025-05-06 43bd3c136f3c2fd7fc54975d763bd2b24a4d0a92

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/GlassComputed.vue

@@ -256,8 +256,8 @@
              "order_number": 33,
              "process_id": "NG24120028A005",
              "technology_number": 2,
              "tempering_feed_sequence": 14,
              "tempering_layout_id": 15,
              "tempering_feed_sequence": 1,
              "tempering_layout_id": 1,
              "width": 814,
              "x_coordinate": 1582.0,
              "y_coordinate": 3768.0
@@ -270,8 +270,8 @@
              "order_number": 33,
              "process_id": "NG24120028A005",
              "technology_number": 2,
              "tempering_feed_sequence": 14,
              "tempering_layout_id": 15,
              "tempering_feed_sequence": 2,
              "tempering_layout_id": 1,
              "width": 814,
              "x_coordinate": 1582.0,
              "y_coordinate": 3768.0