于杰
2025-09-01 e1933496eaadf768096b8d23064427c64a441c23
修改保存opt文件传入参数,钢化最大装载率默认50
3个文件已修改
55 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeParms.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/Compute.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeParms.vue
@@ -387,7 +387,7 @@
  background-color: white;
  padding: 15px;
  border-radius: 8px;
  box-shadow: 0 2px 4 rgba(0, 0, 0, 0.1);
  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
}
.sidebar-item {
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/Compute.vue
@@ -47,7 +47,7 @@
const optionVal = ref(50)
// 定义装载率
const percentage1 = ref(80)
const percentage1 = ref(50)
const percentage2 = ref(50)
// 定义其他表单数据
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -1881,27 +1881,40 @@
    </select>
    <select id="getOptimizeDetailsInfo" resultType="java.util.Map">
        SELECT
            0 As isRemain,
            width AS realWidth,
            height AS realHeight,
            p_width AS width,
            p_height AS height,
            process_id AS processId,
            layer,
            total_layer AS totalLayer,
            order_sort As orderSort,
            stock_id AS layoutId,
            stock_number AS glassSort,
            x_axis AS x,
            y_axis AS y,
            mark_icon AS markIcon,
            isRotate,
            glass_point AS glassPoint,
            rack_no As rackNo
            0 AS isRemain,
            od.width AS realWidth,
            od.height AS realHeight,
            od.p_width AS width,
            od.p_height AS height,
            od.process_id AS processId,
            od.layer,
            od.total_layer AS totalLayer,
            od.order_sort AS orderSort,
            od.stock_id AS layoutId,
            od.stock_number AS glassSort,
            od.x_axis AS x,
            od.y_axis AS y,
            od.mark_icon AS markIcon,
            od.isRotate,
            od.glass_point AS glassPoint,
            fc.order_id AS orderNo,
            ogd.process,
            o.customer_name AS customerName,
            o.processing_note AS processingNote,
            o.project AS projectName,
            ord.product_name AS productName,
            ord.building_number AS buildingNumber,
            COALESCE(h.layout_id, 0) as heatLayoutId,
            od.rack_no AS rackNo
        FROM
            pp.optimize_detail
            pp.optimize_detail od
                LEFT JOIN pp.flow_card fc on od.process_id = fc.process_id
                LEFT JOIN sd.order_glass_detail ogd ON fc.order_id = ogd.order_id
                LEFT JOIN sd.ORDER o ON o.order_id = fc.order_id
                LEFT JOIN sd.order_detail ord ON fc.order_id = ord.order_id
                LEFT JOIN pp.optimize_heat_detail h ON h.process_id = fc.process_id
        WHERE
            project_no = #{projectId}
            od.project_no =  #{projectId}
    </select>
    <select id="getOptimizeOffsetsInfo" resultType="java.util.Map">
        SELECT