解决现场默认值问题，解决现场玻璃id丢失问题，解决现场模拟计算冲突问题

于杰

2025-11-03 d603414388508a7811317e1f39caec87a8725d39

解决现场默认值问题，解决现场玻璃id丢失问题，解决现场模拟计算冲突问题

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

@@ -108,8 +108,8 @@
    // parsedData.cutting.lift_retract = parsedData.cutting.lift_retract !== undefined ? parsedData.cutting.lift_retract : 0;



    // 为 server 参数添加默认值

    parsedData.server.printLayouts = parsedData.server.printLayouts !== undefined ? parsedData.server.printLayouts : '0';

    parsedData.server.printReport = parsedData.server.printReport !== undefined ? parsedData.server.printReport : '0';

    parsedData.server.printLayouts = parsedData.server.printLayouts !== undefined ? parsedData.server.printLayouts : '1';

    parsedData.server.printReport = parsedData.server.printReport !== undefined ? parsedData.server.printReport : '1';

    parsedData.server.layoutRows = parsedData.server.layoutRows !== undefined ? parsedData.server.layoutRows : '2';

    parsedData.server.layoutColumns = parsedData.server.layoutColumns !== undefined ? parsedData.server.layoutColumns : '2';

    parsedData.server.glassInfoShow = parsedData.server.glassInfoShow !== undefined ? parsedData.server.glassInfoShow : '2';


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

@@ -235,7 +235,7 @@
  {
    code: 'production',
    initialState: 1,
    temperingState: 1,
    // temperingState: 1,
    optimizeState: 1,
    targetState: 100,
    targetStates: 0,
@@ -246,7 +246,7 @@
  {
    code: 'novisible',
    initialState: 100,
    temperingState: 1,
    // temperingState: 1,
    optimizeState: 1,
    targetState: 1,
    targetStates: 0,
@@ -463,7 +463,7 @@
                }
              }
              else if(config.code === 'production'){
                if(row.temperingState==1&&row.optimizeState===1&&row.state===1){
                if(row.optimizeState===1&&row.state===1){
                  row.state = config.targetState;
                  code=3
                }else{

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

@@ -1261,6 +1261,7 @@
            mark_icon,
            isRotate,
            glass_point,
            glass_id,
            rack_no
            ) VALUES (
            #{projectId},
@@ -1280,6 +1281,11 @@
            #{glass.markIcon},
            #{glass.isRotate},
            #{glass.glassPoint},
            CONCAT(
            LPAD(SUBSTR(#{projectId}, 2), 8, '0'),
            LPAD(#{glass.stockSort}, 4, '0'),
            LPAD(#{glass.polySort}, 6, '0')
            ),
            #{glass.rackNo}
            );
        </foreach>
@@ -1924,6 +1930,7 @@
            od.order_sort AS orderSort,
            od.stock_id AS layoutId,
            od.stock_number AS glassSort,
            od.polys_id AS polySort,
            od.x_axis AS x,
            od.y_axis AS y,
            od.mark_icon AS markIcon,