From b9761afd90b4a71803ebfe4f71af5cee65999450 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 15 十二月 2025 09:51:39 +0800
Subject: [PATCH] 流程卡打印厚度显示调整

---
 north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue             |   10 ++++++----
 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java |    1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
index bfb2ece..03e1bee 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -170,13 +170,15 @@
       totalArea = add(totalArea, collection.total_area)
       //鏍规嵁鏈夊嚑灞傝绠楅噸閲�
       for (let j = 0; j < produceList.value[i].detail.length; j++) {
-        if (produceList.value[i].detail[j].technologyNumber.length>1){
-          totalWeight += collection.weight * collection.quantity  * 1;
-
+       let ceng = produceList.value[i].detail[j].technologyNumber.length
+        if (produceList.value[i].processName!=""){
+          for (let k = 0; k < produceList.value[i].detail[j].technologyNumber.length; k++) {
+            totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
+          }
         }else {
           totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
-
         }
+
       }
 
       //姣忎釜搴忓彿鍛ㄩ暱
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index 1a0998f..ab83555 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -464,6 +464,7 @@
                         }
 
                     }
+                    itemmap.put("processName",processName);
 
                 }
 

--
Gitblit v1.8.0