From 670a2a2179c7c6f70316826ded2a76572eee760a Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 19 七月 2024 17:32:11 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue | 14 +++---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue | 2
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue | 27 +++++++------
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue | 19 +++++----
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue | 2
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 2
8 files changed, 37 insertions(+), 33 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
index 985ba4c..05c9ad7 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
@@ -141,11 +141,11 @@
</tr>
<tr class="title-s">
- <th colspan="2"></th>
- <th colspan="5" >
- <h3 style="margin-left: 25%">鐢熸垚浠诲姟鍗�(鎴愬搧)</h3>
+ <th colspan="2" style="width: 30%"></th>
+ <th colspan="5" style="width: 40%;">
+ <h3 >鐢熸垚浠诲姟鍗�(鎴愬搧)</h3>
</th>
- <th colspan="2" style="text-align: center;font-weight: bold;">璁㈠崟缂栧彿锛�<span>{{ data.order.orderId }}</span></th>
+ <th colspan="2" style="width: 30%;">璁㈠崟缂栧彿锛�<span>{{ data.order.orderId }}</span></th>
</tr>
<tr>
<th style="text-align: left;border:none;font-weight: bold;font-size: 17px;" colspan="4">
@@ -188,24 +188,24 @@
<tr class="day-in" v-for="(items, index1) in item.productDetail" :key="index1">
<td>{{items.orderNumber}}</td>
<td>{{items.buildingNumber}}</td>
- <td colspan="3" style="font-size: 15px;font-weight: bold;" v-if="items.otherColumns?.S02">{{items.otherColumns?.S02}}</td>
- <td colspan="3" style="font-size: 15px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
- <td>{{items.quantity}}</td>
- <td>{{items.grossArea.toFixed(2)}}</td>
+ <td colspan="3" style="font-size: 20px;font-weight: bold;" v-if="items.otherColumns?.S02">{{items.otherColumns?.S02}}</td>
+ <td colspan="3" style="font-size: 20px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
+ <td style="font-size: 20px;font-weight: bold;">{{items.quantity}}</td>
+ <td style="font-size: 20px;font-weight: bold;">{{items.grossArea.toFixed(2)}}</td>
<td colspan="2">{{items.processingNote}}</td>
</tr>
<tr class="day-in" >
<td style="font-size: 15px;font-weight: bold;" colspan="5">灏忚:</td>
- <td>{{getQuantity(item.productDetail)}}</td>
- <td>{{getArea(item.productDetail)}}</td>
+ <td style="font-size: 20px;font-weight: bold;">{{getQuantity(item.productDetail)}}</td>
+ <td style="font-size: 20px;font-weight: bold;">{{getArea(item.productDetail)}}</td>
<td colspan="2"></td>
</tr>
</template>
<tr class="day-in">
<td style="font-size: 15px;font-weight: bold;" colspan="5">鍚堣:</td>
- <td>{{grossNum.quantity}}</td>
- <td>{{grossNum.grossArea}}</td>
+ <td style="font-size: 20px;font-weight: bold;">{{grossNum.quantity}}</td>
+ <td style="font-size: 20px;font-weight: bold;">{{grossNum.grossArea}}</td>
<td colspan="2"></td>
</tr>
<tr class="day-in">
@@ -319,6 +319,9 @@
margin: 0;
padding: 0;
}
+.day-in{
+ height: 30px;
+}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue
index 152641b..8acc7c9 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue
@@ -111,7 +111,7 @@
<span>{{ item.project }}</span>
<span>{{ item.buildingNumber }}</span>
</div>
- <div class="row3" v-if="item.other_columns==null||JSON.parse(item.other_columns).S02==null">{{item.width}}*{{item.height}}={{item.quantity}}</div>
+ <div class="row3" v-if="item.other_columns==null||JSON.parse(item.other_columns).S02==null">{{item.width}}x{{item.height}}={{item.quantity}}</div>
<div class="row3" v-else>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
<div class="row5">
<span>{{item.remarks}}</span>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue
index dc02b6d..42573ab 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue
@@ -111,7 +111,7 @@
<span>{{ item.project }}</span>
<span>{{ item.buildingNumber }}</span>
</div>
- <div class="row3" v-if="item.other_columns==null||JSON.parse(item.other_columns).S02==null">{{item.width}}*{{item.height}}={{item.quantity}}</div>
+ <div class="row3" v-if="item.other_columns==null||JSON.parse(item.other_columns).S02==null">{{item.width}}x{{item.height}}={{item.quantity}}</div>
<div class="row3" v-else>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
<div class="row5">
<span>{{item.remarks}}</span>
@@ -150,19 +150,19 @@
.row1 {
font-size: 12pt;
font-weight: bold;
- height: 25px;
+ height: 30px;
}
.row1 span {
- font-size: 12pt;
+ font-size: 14pt;
}
.row2 {
- font-size: 12pt;
+ font-size: 14pt;
font-weight: bold;
- height: 25px;
+ height: 30px;
}
.row2 span {
- font-size: 12pt;
+ font-size: 14pt;
}
span {
font-size: 12pt;
@@ -172,17 +172,18 @@
.row3 {
margin-top: -5px;
height: 30px;
- font-size: 20pt;
+ font-size: 22pt;
font-weight: bolder;
+ line-height: 30px;
}
.row5 {
- height: 25px;
+ height: 40px;
font-weight: bold;
font-size: 12pt;
}
.row5 span {
- font-size: 12pt;
+ font-size: 14pt;
}
.row6 {
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
index bdac797..cef81b4 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
@@ -114,7 +114,7 @@
<span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
</div>
<div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
- <div class="row3" v-else>{{Math.round(item.width)}}*{{Math.round(item.height)}}={{item.quantity}}</div>
+ <div class="row3" v-else>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</div>
<div class="row5">
<span>{{item.glass_child}}</span>
<span>{{item.processing_note}}</span>
@@ -155,15 +155,15 @@
height: 35px;
}
.row1 span {
- font-size: 12pt;
+ font-size: 14pt;
}
.row2 {
font-size: 12pt;
font-weight: bold;
- height: 25px;
+ height: 30px;
}
.row2 span {
- font-size: 12pt;
+ font-size: 14pt;
}
span {
font-size: 12pt;
@@ -173,7 +173,7 @@
.row3 {
margin-top: -5px;
height: 30px;
- font-size: 20pt;
+ font-size: 22pt;
font-weight: bolder;
line-height: 30px;
}
@@ -181,10 +181,10 @@
.row5 {
height: 40px;
font-weight: bold;
- font-size: 12pt;
+ font-size: 14pt;
}
.row5 span {
- font-size: 12pt;
+ font-size: 14pt;
}
.row6 {
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
index 86a8116..2407538 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
@@ -135,7 +135,7 @@
</div>
<div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
- <div class="row3" v-else>{{Math.round(item.width)}}*{{Math.round(item.height)}}={{item.quantity}}</div>
+ <div class="row3" v-else>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</div>
<div class="row5">
<span>{{item.project}}</span>
<span>{{ item.building_number }}</span>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue
index 430d78e..6544d10 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue
@@ -110,7 +110,7 @@
<span>{{ item.project }}</span>
<span>{{ item.buildingNumber }}</span>
</div>
- <div class="row3" v-if="item.other_columns==null||JSON.parse(item.other_columns).S02==null">{{item.width}}*{{item.height}}={{item.quantity}}</div>
+ <div class="row3" v-if="item.other_columns==null||JSON.parse(item.other_columns).S02==null">{{item.width}}x{{item.height}}={{item.quantity}}</div>
<div class="row3" v-else>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
<div class="row5">
<span>{{item.remarks}}</span>
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index 34f7620..1d157c1 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -143,7 +143,7 @@
getMinIdByGroup(orderId,
String.valueOf(detail.get("order_number")),
String.valueOf(detail.get("group")));
- int listGlassId = Integer.parseInt(String.valueOf(detail.get("id")));
+ int listGlassId = Integer.parseInt(String.valueOf(detail.get("glassId")));
if(listGlassId !=glassId){
detail.put("rowClass","latter");
}
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index 523f885..648fe20 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -195,7 +195,7 @@
ogd.`group`,
if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
od.other_columns,
- ogd.id
+ ogd.id as 'glassId'
FROM
sd.order_detail AS od
--
Gitblit v1.8.0