修改模拟计算查询逻辑

于杰

2025-09-02 d4bc72cb5c9c8f4a21852102126db75fda039d41

修改模拟计算查询逻辑

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

@@ -147,7 +147,7 @@
};



onMounted(() => {

  // 读取库存数据

  // 读取库存数据和参数设置

  loadInventoryData();

  selectLayout();

  selectOptimizeInfo();


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

@@ -243,7 +243,8 @@
        <div class="display-settings">

          <h2>结果输出设置</h2>

          <div class="form-group">

            <label>文件模式</label>

            <label>切割文件保存模式</label>

            <div style="margin-left: 3px;"></div>

            <div class="radio-group">

              <input

                  type="radio"


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

@@ -1711,7 +1711,10 @@
                    p.creater = a.Id
                    )))
        WHERE
            ( p.state = 1 ) and p.tempering_state=0 and optimize_state=0 and p.project_no = #{projectNo}
            ( p.state = 1 ) and
#             p.tempering_state=0 and
#             optimize_state=0 and
            p.project_no = #{projectNo}
        ORDER BY
            p.create_time DESC,
            p.project_no