ERP_override.git

			@@ -261,6 +261,7 @@
			ElMessage.success(config.successMsg);
			}
			});
			return;
			}
			// 添加确认提示弹窗，询问用户是否进行当前操作
			ElMessageBox.confirm('是否进行当前操作？', '确认操作', {

			@@ -344,6 +344,10 @@

			//点击小片
			const handleRectClick = (layoutIndex, rectIndex) => {
			if (dragging.value) {
			return;
			}

			focusIndex.value = { layoutIndex, rectIndex };
			emit('rectClicked', layoutIndex, rectIndex);
			};
			@@ -536,7 +540,6 @@
			const glassDetail = layout.glassDetails[rectIndex];
			if (glassDetail.isRemain) return;

			dragging.value = true;
			dragRect.value = { layoutIndex, rectIndex };
			dragStartPos.value = {
			x: event.clientX,
			@@ -546,7 +549,22 @@

			//小片鼠标移动事件
			const handleRectDragging = (event) => {
			if (!dragging.value \|\| !dragRect.value) return;
			if (!dragRect.value) return;

			// 如果还没确认是拖拽，则先判断是否达到拖拽阈值(例如5像素)
			if (!dragging.value) {
			const deltaX = event.clientX - dragStartPos.value.x;
			const deltaY = event.clientY - dragStartPos.value.y;
			const distance = Math.sqrt(deltaX * deltaX + deltaY * deltaY);

			// 如果移动距离小于阈值，则认为是点击而非拖拽
			if (distance < 5) {
			return;
			}

			// 达到阈值，确认是拖拽操作
			dragging.value = true;
			}

			const layoutIndex = dragRect.value.layoutIndex;
			const rectIndex = dragRect.value.rectIndex;
			@@ -612,6 +630,9 @@

			//小片鼠标松开事件
			const handleRectDragEnd = () => {
			dragging.value = false;
			dragRect.value = null;
			dragStartPos.value = { x: 0, y: 0 };
			if (dragRect.value) {
			const layoutIndex = dragRect.value.layoutIndex;
			const rectIndex = dragRect.value.rectIndex;

			@@ -47,7 +47,7 @@
			@Autowired
			SysErrorService sysErrorService;

			@Value("${mesIp:localhost}") // 注入mesIp配置，默认值为10.153.19.31
			@Value("${mesIp:10.153.19.31}")
			private String mesIp;

			RabbitMQUtil rabbitMQUtil;
			@@ -1256,6 +1256,7 @@
			public Boolean issuingProjects(String projectNo) throws JsonProcessingException {
			boolean saveState=false;
			try {
			System.out.println(mesIp);
			// 1. 创建URL对象
			URL url = new URL("http://" + mesIp + ":88/api/loadGlass/engineering/importEngineer");

			@@ -1570,7 +1570,7 @@
			x_axis = #{detail.x},
			y_axis = #{detail.y}
			WHERE
			project_no = #{processId} AND polys_id = #{detail.polySort}
			project_no = #{processId} AND polys_id = #{detail.polySort} AND stock_id = #{detail.stockSort}
			</update>
			<update id="updateProjectOptimize">
			update pp.optimize_project as p

	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectCreate.vue	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizationRect.vue	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史