ERP_override.git

			@@ -121,8 +121,8 @@
			parsedData.server.glassIdMode = parsedData.server.glassIdMode !== undefined ? parsedData.server.glassIdMode : '1';
			parsedData.server.optimaMarkPosition = parsedData.server.optimaMarkPosition !== undefined ? parsedData.server.optimaMarkPosition : '1';
			parsedData.server.optimaMarkName = parsedData.server.optimaMarkName !== undefined ? parsedData.server.optimaMarkName : 'erweima_8mm';
			parsedData.server.optimaMarkWidth = parsedData.server.optimaMarkWidth !== undefined ? parsedData.server.optimaMarkWidth : '8mm';
			parsedData.server.optimaMarkHeight = parsedData.server.optimaMarkHeight !== undefined ? parsedData.server.optimaMarkHeight : '8mm';
			parsedData.server.optimaMarkWidth = parsedData.server.optimaMarkWidth !== undefined ? parsedData.server.optimaMarkWidth : 8;
			parsedData.server.optimaMarkHeight = parsedData.server.optimaMarkHeight !== undefined ? parsedData.server.optimaMarkHeight : 8;
			parsedData.server.output_format = parsedData.server.output_format !== undefined ? parsedData.server.output_format : '';
			parsedData.server.cutting_code_save_path = parsedData.server.cutting_code_save_path !== undefined ? parsedData.server.cutting_code_save_path : '';
			parsedData.server.open_folder_after_save = parsedData.server.open_folder_after_save !== undefined ? parsedData.server.open_folder_after_save : '';

			@@ -71,7 +71,6 @@
			</div>
			</div>

			<!-- 提交按钮 -->
			<!-- <button @click="submitLayouts" style="position: fixed; top: 90px; right: 20px; padding: 10px; background: #409eff; color: white; border: none; border-radius: 5px; cursor: pointer;">-->
			<!-- 保存调整-->
			<!-- </button>-->

			@@ -1936,7 +1936,7 @@
			o.project AS projectName,
			ord.product_name AS productName,
			ord.building_number AS buildingNumber,
			COALESCE(h.layout_id, 0) as heatLayoutId,
			# COALESCE(h.layout_id, 0) as heatLayoutId,
			od.rack_no AS rackNo
			FROM
			pp.optimize_detail od
			@@ -1944,7 +1944,7 @@
			LEFT JOIN sd.order_glass_detail ogd ON (fc.order_id = ogd.order_id and od.order_sort = ogd.order_number AND ogd.technology_number = fc.technology_number)
			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 and od.order_sort = ord.order_number)
			LEFT JOIN pp.optimize_heat_detail h ON (h.process_id = fc.process_id and od.order_sort = h.sort)
			# LEFT JOIN pp.optimize_heat_detail h ON (h.process_id = fc.process_id and od.order_sort = h.sort)
			WHERE
			od.project_no = #{projectId}
			</select>

	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeParms.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizationRect.vue	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史