From e9e31158de31a301646cdcebf1b366635e206a23 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 28 七月 2025 13:42:34 +0800
Subject: [PATCH] 提交 装箱单多选显示
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 3 +
north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue | 69 ++++++++++++++++++++--------------
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 2
3 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue b/north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue
index f2b41b1..0ed6705 100644
--- a/north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue
+++ b/north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue
@@ -88,37 +88,50 @@
customer.value = produceList.value[0].detail[0]
let height = 0
let index = 0
-
- produceList.value[0].detailList.forEach(order => {
- if(orderDetailList.value[index]===undefined){
- orderDetailList.value[index]=[]
- }
- height+=50
- //鍒ゆ柇楂樺害鏄惁瓒呰繃350锛屽垯鎹㈤〉
- if(height>=500){
- height=0
+ for(let i=0;i<produceList.value.length;i++){
+ //鎹骇鍝佸氨鎹㈤〉
+ if(i>0){
index+=1
- orderDetailList.value[index]=[]
}
+ orderDetailList.value[index]=[]
orderDetailList.value[index].push({
- type:'product',
- productName:order.product_name
+ type:'customer',
+ customer:produceList.value[i].detail[0]
})
-
-
- order.detailList.forEach(item => {
- height+=30
+ produceList.value[i].detailList.forEach(order => {
+ height+=50
+ //鍒ゆ柇楂樺害鏄惁瓒呰繃350锛屽垯鎹㈤〉
if(height>=500){
height=0
index+=1
orderDetailList.value[index]=[]
+
+ orderDetailList.value[index].push({
+ type:'customer',
+ customer:produceList.value[i].detail[0]
+ })
}
orderDetailList.value[index].push({
- type:'size',
- size:item
+ type:'product',
+ productName:order.product_name
+ })
+
+
+ order.detailList.forEach(item => {
+ height+=30
+ if(height>=500){
+ height=0
+ index+=1
+ orderDetailList.value[index]=[]
+ }
+ orderDetailList.value[index].push({
+ type:'size',
+ size:item
+ })
})
})
- })
+ }
+ console.log(orderDetailList.value)
orderDetailList.value.forEach((page,index)=>{
let sum = {
quantity:0,
@@ -179,23 +192,23 @@
<div style="display:flex;">
<div style="width: 100%"><span style="font-weight: bold;">瀹㈡埛鍚嶇О</span>锛�
<input class="contactNumber" style="width: 80%;font-size: 9px" type="text"
- v-model="customer.customer_name" />
+ v-model="page[0].customer.customer_name" />
</div>
</div>
<div style="display:flex;">
- <div style="width: 100%"><span style="font-weight: bold">宸ョ▼鍚嶇О</span>锛歿{customer.project}}</div>
+ <div style="width: 100%"><span style="font-weight: bold">宸ョ▼鍚嶇О</span>锛歿{page[0].customer.project}}</div>
</div>
<div style="display:flex;">
- <div style="width: 50%"><span style="font-weight: bold">璁㈠崟鍙�</span>锛歿{customer.order_id}}</div>
- <div style="width: 50%"><span style="font-weight: bold">瑁呯鍗曞彿</span>锛歿{customer.remarks}}</div>
+ <div style="width: 50%"><span style="font-weight: bold">璁㈠崟鍙�</span>锛歿{page[0].customer.order_id}}</div>
+ <div style="width: 50%"><span style="font-weight: bold">瑁呯鍗曞彿</span>锛歿{page[0].customer.remarks}}</div>
</div>
<div style="display:flex;">
- <div style="width: 50%"><span style="font-weight: bold">鍖呰鏃ユ湡</span>锛歿{customer.reporting_work_time}}</div>
- <div style="width: 50%"><span style="font-weight: bold">鏈灦鏁伴噺</span>锛歿{customer.quantity}}</div>
+ <div style="width: 50%"><span style="font-weight: bold">鍖呰鏃ユ湡</span>锛歿{page[0].customer.reporting_work_time}}</div>
+ <div style="width: 50%"><span style="font-weight: bold">鏈灦鏁伴噺</span>锛歿{page[0].customer.quantity}}</div>
</div>
<div style="display:flex;">
- <div style="width: 50%;font-size: 9px"><span style="font-weight: bold">鍔犲伐鐝粍</span>锛歿{customer.teams_groups_name2}}</div>
- <div style="width: 50%;font-size: 9px"><span style="font-weight: bold">鍖呰鐝粍</span>锛歿{customer.teams_groups_name}}</div>
+ <div style="width: 50%;font-size: 9px"><span style="font-weight: bold">鍔犲伐鐝粍</span>锛歿{page[0].customer.teams_groups_name2}}</div>
+ <div style="width: 50%;font-size: 9px"><span style="font-weight: bold">鍖呰鐝粍</span>锛歿{page[0].customer.teams_groups_name}}</div>
</div>
<div style="display:flex;">
<div style="width: 50%"><span style="font-weight: bold">璐ㄩ噺妫�楠�</span>锛氬垬鍖栬強</div>
@@ -231,7 +244,7 @@
<td>{{ row.size.area }}</td>
</tr>
- <tr id="footsum" v-else style="border: 0;font-size: 10px">
+ <tr id="footsum" v-else-if="row.type==='sum'" style="border: 0;font-size: 10px">
<td colspan="5" style="border: 0;">
<div style="display:flex;">
<div>鏈〉鏁伴噺</div>
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index dd14e75..5b7e0ba 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -388,7 +388,7 @@
public Map<String,Object> getOrderList(Integer pageNum, Integer pageSize, List<String> selectDate, Map<String,Object> config,Integer orderType) {
Integer offset = (pageNum-1)*pageSize;
String endDate = LocalDate.now().toString();
- String startDate = LocalDate.now().minusDays(15).toString();
+ String startDate = LocalDate.now().minusDays(365).toString();
if(selectDate !=null && selectDate.size()==2){
if(!selectDate.get(0).isEmpty()){
startDate = selectDate.get(0);
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
index edcf65d..1af63db 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -803,7 +803,8 @@
and fol.remarks regexp #{finishedOperateLog.remarksr}
</if>
</where>
- group by fol.remarks,od.order_id,fol.process_id
+ group by fol.remarks,od.order_id
+ -- ,fol.process_id
order by fol.operate_time desc
limit #{offset},#{pageSize};
</select>
--
Gitblit v1.8.0