From 44ec7c27cc897a710ff116d52a790f45ce081dcb Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期二, 30 十二月 2025 09:06:09 +0800
Subject: [PATCH] 修复 旋转错判问题
---
north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
index b3bab2d..48e877e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
@@ -1793,7 +1793,6 @@
glassOptimizeMapper.deleteOptimizeDynamicLayout(projectNo);
glassOptimizeMapper.deleteOptimizeDynamicDetail(projectNo);
- // 鎻掑叆鍔ㄦ�侀」鐩�
glassOptimizeMapper.insertDynamicProject(dataMap);
// 澶勭悊 layouts 鏁扮粍骞舵彃鍏�
@@ -1817,26 +1816,26 @@
detail.put("projectNo", projectNo);
- // 澶勭悊 isRotate 涓� 1 鏃朵氦鎹� width 鍜� height 鐨勯�昏緫
- if (detail.containsKey("isRotate")) {
- Object isRotateObj = detail.get("isRotate");
- int isRotate = 0;
- if (isRotateObj instanceof Number) {
- isRotate = ((Number) isRotateObj).intValue();
- } else if (isRotateObj instanceof String) {
- isRotate = Integer.parseInt(isRotateObj.toString());
- }
-
- if (isRotate == 1) {
- // 浜ゆ崲 width 鍜� height
- Object widthObj = detail.get("width");
- Object heightObj = detail.get("height");
- detail.put("width", heightObj);
- detail.put("height", widthObj);
-
-
- }
- }
+// // 澶勭悊 isRotate 涓� 1 鏃朵氦鎹� width 鍜� height 鐨勯�昏緫
+// if (detail.containsKey("isRotate")) {
+// Object isRotateObj = detail.get("isRotate");
+// int isRotate = 0;
+// if (isRotateObj instanceof Number) {
+// isRotate = ((Number) isRotateObj).intValue();
+// } else if (isRotateObj instanceof String) {
+// isRotate = Integer.parseInt(isRotateObj.toString());
+// }
+//
+// if (isRotate == 1) {
+// // 浜ゆ崲 width 鍜� height
+// Object widthObj = detail.get("width");
+// Object heightObj = detail.get("height");
+// detail.put("width", heightObj);
+// detail.put("height", widthObj);
+//
+//
+// }
+// }
// 澶勭悊 glassPoint 瀛楁杞崲
if (detail.containsKey("glassPoint")) {
@@ -1932,12 +1931,12 @@
String glassId = damageItem.get("glassId").toString();
Map<String, Object> processedItem = new HashMap<>(damageItem);
- // 濡傛灉glassId鍦╣lassInfolList涓瓨鍦紝reportState淇濇寔涓�10锛屽惁鍒欐敼涓�1
+ // 濡傛灉glassId鍦╣lassInfolList涓瓨鍦紝reportState淇濇寔涓�10锛屽惁鍒欐敼涓�6
if (glassIdSet.contains(glassId)) {
// glassId瀛樺湪锛屼繚鎸乺eportState涓�10锛堝凡鍦╣lassDamageTempList涓缃級
processedItem.put("reportState", 10);
} else {
- // glassId涓嶅瓨鍦紝灏唕eportState鏀逛负1
+ // glassId涓嶅瓨鍦紝灏唕eportState鏀逛负6
processedItem.put("reportState", 6);
}
--
Gitblit v1.8.0