From e490a85c14e9147f424b5c971b1d0d04928eb613 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 10 七月 2025 18:16:21 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 10 ++++
north-glass-erp/northglass-erp/src/views/mm/productStock/StorageRecord.vue | 1
north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue | 62 ++++++++++++++----------------
3 files changed, 39 insertions(+), 34 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/productStock/StorageRecord.vue b/north-glass-erp/northglass-erp/src/views/mm/productStock/StorageRecord.vue
index 01b019c..713a6ef 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/productStock/StorageRecord.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/productStock/StorageRecord.vue
@@ -213,6 +213,7 @@
{field: 'operationNumber', width: '100',title: t('order.OrderNum'), showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'processId', width: '150',title: t('processCard.processId'), showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'quantity', width: '140',title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'orderDetail.price', width: '140',title: t('order.price'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'orderDetail.productId',width: '100', title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'orderDetail.productName',width: '140', title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'orderDetail.width', width: '100',title: t('order.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
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 a1d85f2..631b186 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
@@ -38,7 +38,7 @@
},
mouseConfig:{selected: true},
filterConfig: { //绛涢�夐厤缃」
- // remote: true
+ // remote: true
},
customConfig: {
storage: true
@@ -82,14 +82,14 @@
menuConfig:{
body:{
options:[
- [
- { code: 'copyChecked', name: t('basicData.selectSame'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
- { code: 'copyAll', name: t('basicData.sameAfterwards'), prefixIcon: 'vxe-icon-feedback', visible: true, disabled: false },
- { code: 'clearChecked', name: t('basicData.clearSelection'), prefixIcon: 'vxe-icon-indicator', visible: true, disabled: false },
- { code: 'computedSize', name: t('basicData.computedSize'), prefixIcon: 'vxe-icon-chart-line', visible: true, disabled: false },
- { code: 'paste', name: t('basicData.paste'), prefixIcon: 'vxe-icon-paste', visible: true, disabled: false },
- { code: 'sort', name: t('craft.sort'), prefixIcon: 'vxe-icon-sort-asc', visible: true, disabled: false },
- ]
+ [
+ { code: 'copyChecked', name: t('basicData.selectSame'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
+ { code: 'copyAll', name: t('basicData.sameAfterwards'), prefixIcon: 'vxe-icon-feedback', visible: true, disabled: false },
+ { code: 'clearChecked', name: t('basicData.clearSelection'), prefixIcon: 'vxe-icon-indicator', visible: true, disabled: false },
+ { code: 'computedSize', name: t('basicData.computedSize'), prefixIcon: 'vxe-icon-chart-line', visible: true, disabled: false },
+ { code: 'paste', name: t('basicData.paste'), prefixIcon: 'vxe-icon-paste', visible: true, disabled: false },
+ { code: 'sort', name: t('craft.sort'), prefixIcon: 'vxe-icon-sort-asc', visible: true, disabled: false },
+ ]
]
}
},
@@ -100,7 +100,7 @@
{'code': 'review', 'name': t('basicData.review'),status: 'primary'},
],
// import: false,
- export: true,
+ export: true,
// print: true,
zoom: true,
custom: true
@@ -161,16 +161,16 @@
inputPattern:/^(-?\d{1,4}(\.\d{1,2})?|-?0(\.\d{1,2})?)$/,
inputErrorMessage: '-9999.99~9999.99',
})
- .then(({ value }) => {
- const value1 = value*1
- $grid.getTableData().visibleData.forEach((item,index) =>{
- if(index>=result.start && index<=result.end){
+ .then(({ value }) => {
+ const value1 = value*1
+ $grid.getTableData().visibleData.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
- item[result.cell] = item[result.cell]*1+value1
- }
+ item[result.cell] = item[result.cell]*1+value1
+ }
- })
- })
+ })
+ })
break
}
@@ -236,19 +236,15 @@
for (let i=0; i<uniqueArray.length; i++) {
const sameOrderNumber = xGrid.value.getTableData().fullData.filter((item) =>
- parseInt(item.orderNumber) === i+1
+ parseInt(item.orderNumber) === i+1
)
let widthList = []
- let arcList = []
- sameOrderNumber.forEach((item) =>{
- widthList.push(item.childWidth)
- arcList.push(item.arc)
- })
+ sameOrderNumber.forEach((item) =>
+ widthList.push(item.childWidth)
+ )
widthList = widthList.sort();
- arcList = arcList.sort();
sameOrderNumber.forEach((item,index) =>{
item.childWidth = widthList[index]
- item.arc = arcList[index]
})
}
@@ -342,13 +338,13 @@
trademarkAttr.value = {
trademark:"3C",
xImage:false,
- yImage:false,
- tag:true,
- tag2:true ,
- tag3:true,
- xMargin:30,
- yMargin:30,
- location:t('craft.lowLeft')
+ yImage:false,
+ tag:true,
+ tag2:true ,
+ tag3:true,
+ xMargin:30,
+ yMargin:30,
+ location:t('craft.lowLeft')
}
if(row.icon!=null){
trademarkAttr.value = JSON.parse(row.icon)
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 672a9b3..a5777a3 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -28,6 +28,7 @@
<result column="height" property="orderDetail.height"/>
<result column="product_id" property="orderDetail.productId"/>
<result column="product_name" property="orderDetail.productName"/>
+ <result column="price" property="orderDetail.price"/>
<result column="project" property="order.project"/>
<result column="customer_name" property="order.customerName"/>
@@ -60,7 +61,8 @@
fol.area,
fol.money,
o.customer_name,
- o.project
+ o.project,
+ od.price
from (select *
from mm.finished_operate_log aa where aa.operate_type = #{type} and aa.status!='宸蹭綔搴�') fol
left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
@@ -90,6 +92,9 @@
</if>
<if test="finishedOperateLog.orderDetail.productName != null and finishedOperateLog.orderDetail.productName != ''">
and od.product_name regexp #{finishedOperateLog.orderDetail.productName}
+ </if>
+ <if test="finishedOperateLog.orderDetail.price != null and finishedOperateLog.orderDetail.price != ''">
+ and od.price regexp #{finishedOperateLog.orderDetail.price}
</if>
<if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
and od.width regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')
@@ -161,6 +166,9 @@
<if test="finishedOperateLog.orderDetail.productName != null and finishedOperateLog.orderDetail.productName != ''">
and od.product_name regexp #{finishedOperateLog.orderDetail.productName}
</if>
+ <if test="finishedOperateLog.orderDetail.price != null and finishedOperateLog.orderDetail.price != ''">
+ and od.price regexp #{finishedOperateLog.orderDetail.price}
+ </if>
<if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
and od.width regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')
</if>
--
Gitblit v1.8.0