sunxianglong hai 2 semanas
pai
achega
41c6a33334
Modificáronse 2 ficheiros con 29 adicións e 9 borrados
  1. 18 5
      src/com/mes/ui/DataUtil.java
  2. 11 4
      src/com/mes/ui/WorkRecordPanel.java

+ 18 - 5
src/com/mes/ui/DataUtil.java

@@ -273,11 +273,11 @@ public class DataUtil {
                     data.setId(item.getString("id"));
                     data.setLc(item.getString("lc"));
                     data.setBc(item.getString("bc"));
-                    data.setYzl(item.getString("yzl"));
-                    data.setHzl(item.getString("hzl"));
-                    data.setYQpZl(item.getString("yQpZl"));
-                    data.setHQpZl(item.getString("hQpZl"));
-                    data.setHlBl(item.getString("hlBl"));
+                    data.setYzl(firstJsonString(item, "yzl", "Yzl", "y_zl"));
+                    data.setHzl(firstJsonString(item, "hzl", "Hzl", "h_zl"));
+                    data.setYQpZl(firstJsonString(item, "yQpZl", "YQpZl", "yqpZl", "y_qp_zl"));
+                    data.setHQpZl(firstJsonString(item, "hQpZl", "HQpZl", "hqpZl", "h_qp_zl"));
+                    data.setHlBl(firstJsonString(item, "hlBl", "HlBl", "hl_bl"));
                     String updateBy = item.getString("remarks");
                     if (updateBy == null || updateBy.isEmpty()) {
                         Object createBy = item.get("createBy");
@@ -355,4 +355,17 @@ public class DataUtil {
         }
         return String.format("%.2f", numer / denom);
     }
+
+    private static String firstJsonString(JSONObject item, String... keys) {
+        if (item == null || keys == null) {
+            return "";
+        }
+        for (String key : keys) {
+            String value = item.getString(key);
+            if (value != null && !value.trim().isEmpty()) {
+                return value;
+            }
+        }
+        return "";
+    }
 }

+ 11 - 4
src/com/mes/ui/WorkRecordPanel.java

@@ -262,10 +262,10 @@ public class WorkRecordPanel extends JPanel {
                 tableModel.addRow(new Object[]{
                         data.getLc(),
                         data.getBc(),
-                        data.getYzl(),
-                        data.getHzl(),
-                        data.getYQpZl(),
-                        data.getHQpZl(),
+                        formatKg(data.getYzl()),
+                        formatKg(data.getHzl()),
+                        formatKg(data.getYQpZl()),
+                        formatKg(data.getHQpZl()),
                         data.getHlBl(),
                         data.getUpdateBy(),
                         data.getCreateDate()
@@ -275,6 +275,13 @@ public class WorkRecordPanel extends JPanel {
         table.repaint();
     }
 
+    private static String formatKg(String value) {
+        if (value == null || value.trim().isEmpty()) {
+            return "0.00";
+        }
+        return value;
+    }
+
     private void updateUIError(String message) {
         statusLabel.setText("错误: " + message);
         pageLabel.setText("0/0");