guoyujie
2025-04-23 6982cc225fad36090b8a348cd282463381c9d1dc
Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
2个文件已修改
29 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/Compute.vue 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/Report.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/Compute.vue
@@ -63,6 +63,33 @@
  quantity.value=props.project.quantity
}
const fetchSettings = async (username) => {
  try {
    const response = await request.post(`/glassOptimize/selectOptimizeParms/${username}`);
    if (response.code == 200) {
      if (!response.data) {
        console.error('响应数据为空');
        return;
      }
      const parsedData = JSON.parse(response.data);
      if (parsedData.tempering) {
        furnaceLength.value = parsedData.tempering.furnaceLength;
        furnaceWidth.value = parsedData.tempering.furnaceWidth;
        spacingWidth.value=parsedData.tempering.xAxisInterval;
        spacingLong.value=parsedData.tempering.yAxisInterval;
        heatingTime.value=parsedData.tempering.temperingTime;
      }
    } else {
      console.error('请求失败,状态码:', response.code);
    }
  } catch (error) {
    console.error('请求发生错误:', error);
  }
};
fetchSettings(username);
const gridOptions = reactive({
  height: '100%',
north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -701,7 +701,7 @@
                 LEFT JOIN sd.order_glass_detail AS ogd ON o.order_id = ogd.order_id
            AND ogd.order_number = od.order_number
                 LEFT JOIN flow_card AS fc ON fc.order_id = ogd.order_id
            AND fc.order_number
            AND fc.order_number = od.order_number
            AND fc.technology_number = ogd.technology_number
        WHERE fc.order_id = #{orderId}
        GROUP BY fc.id