解决纱线规格统计加入大经编数据

jjt-biz/src/main/java/com/jjt/biz/vo/FormulaDetail.java

@@ -167,23 +167,12 @@ public class FormulaDetail {
             }
         }
 
-        // 容量数据(浮点转字符串)
-        int[] capacityFloatFields = {10, 11, 12, 13, 14};
+        // 剩余周长，剩余圈数
+        int[] capacityFloatFields = {10, 11, 12, 13, 14, 15, 16, 17, 18, 19};
         for (int i : capacityFloatFields) {
             try {
-                float value = (float) map.get("Capacity_data_" + i);
-                this.getClass().getDeclaredField("capacity_data_" + i).set(this, value + "");
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        // 容量数据(整数转字符串)
-        int[] capacityIntFields = {15, 16, 17, 18, 19};
-        for (int i : capacityIntFields) {
-            try {
-                int value = (int) map.get("Capacity_data_" + i);
-                this.getClass().getDeclaredField("capacity_data_" + i).set(this, value + "");
+                Number value = (Number) map.get("Capacity_data_" + i);
+                this.getClass().getDeclaredField("capacity_data_" + i).set(this, value.intValue() + "");
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -209,6 +198,7 @@ public class FormulaDetail {
         this.formula_data_16 = (float) map.get("Formula_data_56");
         this.formula_data_17 = (float) map.get("Formula_data_57");
         this.formula_data_18 = (float) map.get("Formula_data_58");
+        //送经量
         this.formula_data_19 = String.format("%d,%d",
                 ((Number) map.get("Formula_data_1")).intValue(),
                 ((Number) map.get("Formula_data_2")).intValue());
@@ -224,21 +214,47 @@ public class FormulaDetail {
         this.formula_data_23 = String.format("%d,%d",
                 ((Number) map.get("Formula_data_9")).intValue(),
                 ((Number) map.get("Formula_data_10")).intValue());
+        // 优化处理剩余周长和剩余圈数赋值逻辑
+        int[][] fieldConfigs = {
+                {10, 11, 12, 13, 14},  // zcFields
+                {3, 2},                 // zcIndex和步长
+                {15, 16, 17, 18, 19},   // qsFields
+                {15, 2}                 // qsIndex和步长
+        };
 
+        for (int config = 0; config < fieldConfigs.length; config += 2) {
+            int[] fields = fieldConfigs[config];
+            int startIndex = fieldConfigs[config + 1][0];
+            int step = fieldConfigs[config + 1][1];
 
-        this.formula_data_24 = (float) map.get("Capacity_data_112");
-        int index = 10;
-        this.bigSj = new Float[index];
-        this.bigZc = new Float[index];
-        this.bigQs = new Integer[index];
-        for (int i = 0; i < index; i++) {
-            int sjIndex = 1;
-            int qsIndex = 15;
-            int zcIndex = 3;
-            bigSj[i] = (float) map.get("Formula_data_" + (i + sjIndex));
-            bigZc[i] = (float) map.get("Capacity_data_" + (i + zcIndex));
-            bigQs[i] = (int) map.get("Capacity_data_" + (i + qsIndex));
+            for (int i = 0; i < fields.length; i++) {
+                int fieldNum = fields[i];
+                int index1 = startIndex + i * step;
+                int index2 = index1 + 1;
+                String value = String.format("%d,%d",
+                        ((Number) map.get("Capacity_data_" + index1)).intValue(),
+                        ((Number) map.get("Capacity_data_" + index2)).intValue());
+
+                try {
+                    Field field = this.getClass().getDeclaredField("capacity_data_" + fieldNum);
+                    field.set(this, value);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
         }
+
+        this.formula_data_24 = (float) map.get("Capacity_data_112");
+//        int index = 10;
+//        this.bigSj = new Float[index];
+//        this.bigZc = new Float[index];
+//        this.bigQs = new Integer[index];
+//        for (int i = 0; i < index; i++) {
+//            int sjIndex = 1;
+//            bigSj[i] = (float) map.get("Formula_data_" + (i + sjIndex));
+//            bigZc[i] = (float) map.get("Capacity_data_" + (i + zcIndex));
+//            bigQs[i] = (int) map.get("Capacity_data_" + (i + qsIndex));
+//        }
     }
 
     public void setCells(Cell[] cells) {
@@ -294,7 +310,9 @@ public class FormulaDetail {
         cells[11].setCellValue(this.formula_data_17);
         cells[12].setCellValue(this.formula_data_18);
         cells[13].setCellValue(this.formula_data_24);
-        cells[14].setCellValue(this.formula_data_25);
+        if (this.formula_data_25 != null) {
+            cells[14].setCellValue(this.formula_data_25);
+        }
 
         cells[15].setCellValue(this.capacity_data_10);
         cells[16].setCellValue(this.capacity_data_11);