From 950424e50bcd42cff0913fef387c537ba7dedfcc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 13 二月 2025 13:59:57 +0800
Subject: [PATCH] 修改流程卡分架界面落架顺序不正确问题,调整流程卡打印半径显示逻辑

---
 north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 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 a1690a1..fd963a8 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
@@ -29,6 +29,13 @@
         return map;
     }
 
+    //宸ョ▼淇℃伅娴佺▼鍗�
+    public Map<String, Object> getProcessCardSv(String projectNo) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", glassOptimizeMapper.getProcessCardMp(projectNo));
+        return map;
+    }
+
     //搴撳瓨淇℃伅
     public Map<String, Object> materialStoreSv(String thickness, String model) {
         Map<String, Object> map = new HashMap<>();
@@ -114,6 +121,9 @@
         if (object.get("userName") != null) {
             userName = object.get("userName").toString();
         }
+        if ("null".equals(projectNmae)) {
+            projectNmae = "";
+        }
         Double sumArea = (double) 0;
         Double area = (double) 0;
         Integer sumQuantity = 0;

--
Gitblit v1.8.0