From 1bc669f980c7cdb13d96eec27053ead30f2f6aec Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 29 七月 2025 16:11:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/router/index.js | 5 +
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue | 6 +
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 1
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyang.vue | 8 +-
north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue | 4 +
north-glass-erp/northglass-erp/src/components/sd/order/UpdateAlienEditor.vue | 8 +-
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue | 3
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyangDetails.vue | 6 +-
north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue | 82 ++++++++++++++++++++++-----
9 files changed, 95 insertions(+), 28 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 915e8b3..2ad6652 100644
--- a/north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue
+++ b/north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue
@@ -123,6 +123,10 @@
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',
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
index 899d1e5..b847d4c 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
@@ -39,6 +39,7 @@
request.post(`/delivery/getSelectDeliveryPrinting`,form.value).then((res) => {
if(res.code==200){
+ console.log(res.data)
produceList.value = deepClone(res.data)
for(let i=0;i<produceList.value.length;i++){
let produceList1= ({
@@ -192,7 +193,7 @@
<thead>
<tr v-if="index===0">
<th style="width: 6%;">搴忓彿</th>
- <th style="width: 15%;">妤煎眰缂栧彿</th>
+ <th style="width: 15%;">妤煎眰缂栧彿(绠卞彿)</th>
<th style="width: 17%;" colspan="1">瀹絏楂�</th>
<th style="width: 10%;">鏁伴噺</th>
<th style="width: 10%;">闈㈢Н</th>
@@ -211,7 +212,8 @@
<tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1">
<td>{{items.order_number}}</td>
- <td>{{items.buildingNumber}}</td>
+ <td v-if="items.box_no!=null&&items.box_no!=''">{{items.buildingNumber}}({{items.box_no}})</td>
+ <td v-else>{{items.buildingNumber}}</td>
<td colspan="1" style="font-size: 15px;font-weight: bold;" v-if="items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null)">{{JSON.parse(items.other_columns).S02}}</td>
<td colspan="1" style="font-size: 15px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
<td>{{items.quantity}}</td>
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
index da77f56..c49e40f 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
@@ -155,7 +155,8 @@
<tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1">
<td>{{items.order_number}}</td>
- <td>{{items.buildingNumber}}</td>
+ <td v-if="items.box_no!=null&&items.box_no!=''">{{items.buildingNumber}}({{items.box_no}})</td>
+ <td v-else>{{items.buildingNumber}}</td>
<td colspan="2" style="font-size: 15px;font-weight: bold;" v-if="items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null)">{{JSON.parse(items.other_columns).S02}}</td>
<td colspan="2" style="font-size: 15px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
<td>{{items.quantity}}</td>
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyang.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyang.vue
index b2b08f4..f2ab561 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyang.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyang.vue
@@ -198,9 +198,11 @@
if(pageData.value[page] === undefined){
return 0
}
- return pageData.value[page].reduce((accumulator, currentValue) => {
+ const val = pageData.value[page].reduce((accumulator, currentValue) => {
return addAuto(accumulator,currentValue.DeliveryDetail.money,2)
}, 0)
+
+ return val===0?'':val
}
@@ -293,12 +295,12 @@
style="width: 80px"
v-if="props.type===1"
>
- {{item.DeliveryDetail.price}}
+ {{item.DeliveryDetail.price == '0' ? '' : item.DeliveryDetail.price}}
</td>
<td
v-if="props.type===1"
>
- {{item.DeliveryDetail.money}}
+ {{item.DeliveryDetail.money == '0' ? '' : item.DeliveryDetail.money}}
</td>
</tr>
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyangDetails.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyangDetails.vue
index f72b938..c01c449 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyangDetails.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyangDetails.vue
@@ -363,12 +363,12 @@
v-if="props.type===1||props.type===3"
style="width: 80px"
>
- {{ items.price }}
+ {{ items.price == '0' ? '' : items.price }}
</td>
<td
v-if="props.type===1||props.type===3"
>
- {{ items.money }}
+ {{ items.money == '0' ? '' : items.money }}
</td>
</tr>
@@ -386,7 +386,7 @@
</td>
<td style="width: 80px"></td>
<td v-if="props.type===1||props.type===3">
- {{ getMoneySum(pageIndex) }}
+ {{ getMoneySum(pageIndex) == '0.00' ? '' : getMoneySum(pageIndex) }}
</td>
</tr>
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/UpdateAlienEditor.vue b/north-glass-erp/northglass-erp/src/components/sd/order/UpdateAlienEditor.vue
index 83484b9..a47e693 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/UpdateAlienEditor.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/UpdateAlienEditor.vue
@@ -430,9 +430,11 @@
//points.value=[0, heightAgv, 0, 0, widthAgv, 0, widthAgv,heightAgv]
let numbers = [point[0], point[2], point[4], point[6]]; // 绀轰緥鏁扮粍
- let maxX1 = Math.max(...numbers); // 鎵惧埌鏈�澶х殑鏁�
- let remaining = numbers.filter(num => num !== maxX1); // 绉婚櫎鏈�澶ф暟锛屽墿涓嬬殑鏁扮粍
- let maxX2 = Math.max(...remaining); // 鍦ㄥ墿浣欑殑鏁颁腑鎵惧埌绗簩澶х殑鏁�
+ let maxX1 = Math.max(...numbers); // 鎵惧埌鏈�澶у��
+ let maxIndex = numbers.findIndex(num => num === maxX1); // 瀹氫綅绗竴涓尮閰嶇储寮�
+ let remaining = [...numbers]; // 澶嶅埗鍘熸暟缁勯伩鍏嶇獊鍙�
+ remaining.splice(maxIndex, 1); // 浠呯Щ闄ょ涓�涓渶澶у�煎疄渚�
+ let maxX2 = Math.max(...remaining); // 鍦ㄥ墿浣欐暟缁勪腑鎵剧浜屽ぇ鍊�
let arr=[]
for (let i=0;i<point.length;i++){
diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index 2c23e8b..9334961 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -1336,6 +1336,11 @@
path: '/app',
name: 'app',
component: () => import('../views/system/app/appDownload.vue')
+ },
+ {
+ path: '/productionScheduleCollect',
+ name: 'productionScheduleCollect',
+ component: () => import('../views/pp/report/WorkInProgressCombination.vue'),
}
]
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue b/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
index 4540375..c3c873f 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
@@ -862,45 +862,95 @@
datas8.value=(maxY - minY) / big
//points.value=[0, heightAgv, 0, 0, widthAgv, 0, widthAgv,heightAgv]
- if(point[0]*big===0){
+ let numbers = [point[0], point[2], point[4], point[6]]; // 绀轰緥鏁扮粍
+ let maxX1 = Math.max(...numbers); // 鎵惧埌鏈�澶у��
+ let maxIndex = numbers.findIndex(num => num === maxX1); // 瀹氫綅绗竴涓尮閰嶇储寮�
+ let remaining = [...numbers]; // 澶嶅埗鍘熸暟缁勯伩鍏嶇獊鍙�
+ remaining.splice(maxIndex, 1); // 浠呯Щ闄ょ涓�涓渶澶у�煎疄渚�
+ let maxX2 = Math.max(...remaining); // 鍦ㄥ墿浣欐暟缁勪腑鎵剧浜屽ぇ鍊�
+
+ let arr=[]
+ for (let i=0;i<point.length;i++){
+ let a=[]
+ if(i % 2 === 0){
+ a.push(point[i])
+ a.push((point[i+1]))
+ arr.push(a)
+ }
+
+ }
+ let x=[]
+ let y=[]
+
+ let upperRight=null //鍙充笂
+ let lowerRight=null //鍙充笅
+ let topLeft=null //宸︿笂
+ let lowerLeft=null //宸︿笅
+
+ arr.forEach(item=>{
+ if(item[0]==maxX1||item[0]==maxX2){
+ x.push(item)
+ }else{
+ y.push(item)
+ }
+ })
+
+ if(x[0][1]>x[1][1]){
+ lowerRight=x[0]
+ upperRight=x[1]
+ }else{
+ upperRight=x[0]
+ lowerRight=x[1]
+ }
+
+ if(y[0][1]>y[1][1]){
+ lowerLeft=y[0]
+ topLeft=y[1]
+ }else {
+ topLeft=y[0]
+ lowerLeft=y[1]
+ }
+
+
+ if(lowerLeft[0]*big===0){
data5.value=0
}else{
- data5.value=round(point[0]*big,0)
+ data5.value=round(lowerLeft[0]*big,0)
}
- if(point[1]*big===0){
+ if(lowerLeft[1]*big===0){
data6.value=0
}else{
- data6.value=maxY-minY-round(point[1]*big,0)
+ data6.value=round(maxY-minY-lowerLeft[1]*big,0)
}
- if(point[2]*big===0){
+ if(topLeft[0]*big===0){
data1.value=0
}else{
- data1.value=round(point[2]*big,0)
+ data1.value=round(topLeft[0]*big,0)
}
- if(point[3]*big===0){
+ if(topLeft[1]*big===0){
data2.value=0
}else{
- data2.value=round(point[3]*big,0)
+ data2.value=round(topLeft[1]*big,0)
}
- if(point[4]*big===0){
+ if(upperRight[0]*big===0){
data3.value=0
}else{
- data3.value=maxX-minX-round(point[4]*big,0)
+ data3.value=round(maxX-minX-upperRight[0]*big,0)
}
- if(point[5]*big===0){
+ if(upperRight[1]*big===0){
data4.value=0
}else{
- data4.value=round(point[5]*big,0)
+ data4.value=round(upperRight[1]*big,0)
}
- if(point[6]*big===0){
+ if(lowerRight[0]*big===0){
data7.value=0
}else{
- data7.value=maxX-minX-round(point[6]*big,0)
+ data7.value=round(maxX-minX-lowerRight[0]*big,0)
}
- if(point[7]*big===0){
+ if(lowerRight[1]*big===0){
data8.value=0
}else{
- data8.value=maxY-minY-round(point[7]*big,0)
+ data8.value=round(maxY-minY-lowerRight[1]*big,0)
}
}
diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
index 52c1051..9712158 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -1200,6 +1200,7 @@
dd.area,
ifnull(od.processing_note,"") as processingNote,
ifnull(od.building_number,"") as buildingNumber,
+ dd.box_no,
dd.price,
od.other_columns,
od.remarks
--
Gitblit v1.8.0