From 2f44fc75c78e9291f07a0864199235cde689fa8d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 十二月 2025 12:29:37 +0800
Subject: [PATCH] 订单明细报表新增楼层编号跟其他列
---
north-glass-erp/northglass-erp/src/components/BasicTable.vue | 73 ++++++++++++++++++++++++++++++++++++
north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml | 8 ++++
north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue | 3 +
north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderDTO.java | 2 +
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java | 3 +
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 27 ++++++++++++-
6 files changed, 113 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/BasicTable.vue b/north-glass-erp/northglass-erp/src/components/BasicTable.vue
index 8f846f1..3318e50 100644
--- a/north-glass-erp/northglass-erp/src/components/BasicTable.vue
+++ b/north-glass-erp/northglass-erp/src/components/BasicTable.vue
@@ -130,6 +130,71 @@
return count.toFixed(2)
}
+//鍚堝苟鏄剧ず鍏朵粬鍒�
+const handleDynamicColumns = (data,title) => {
+ // 1. 鏀堕泦鎵�鏈夎鐨刼therColumns瀛楁锛堝幓閲嶏級
+ const allOtherFields = new Set();
+ data.forEach(row => {
+ if (!row || !row.otherColumns) return;
+
+ let parsedOtherColumns;
+ try {
+ // 鏍稿績锛氬皢瀛楃涓茶В鏋愪负JSON
+ parsedOtherColumns = JSON.parse(row.otherColumns);
+ } catch (e) {
+ console.error('瑙ｆ瀽otherColumns澶辫触锛�', e, '鍘熷鏁版嵁锛�', row.otherColumns);
+ return;
+ }
+
+ // 2. 浠庤В鏋愬悗鐨凧SON涓敹闆嗗瓧娈碉紙鏀寔鏁扮粍鎴栧璞℃牸寮忥級
+ if (Array.isArray(parsedOtherColumns)) {
+ // 鏁扮粍鏍煎紡锛歔{ key: 'field1', label: '瀛楁1', value: '鍊�1' }, ...]
+ parsedOtherColumns.forEach(item => {
+ if (item.key) allOtherFields.add(item.key);
+ });
+ } else if (typeof parsedOtherColumns === 'object' && parsedOtherColumns !== null) {
+ // 瀵硅薄鏍煎紡锛歿 field1: { label: '瀛楁1', value: '鍊�1' }, ... }
+ Object.keys(parsedOtherColumns).forEach(key => {
+ allOtherFields.add(key);
+ });
+ }
+ });
+
+ // 2. 鐢熸垚鍔ㄦ�佸瓙鍒楋紙浣滀负processList鐨刢hildren锛�
+ const otherColumns = Array.from(allOtherFields).map(field => {
+ // 灏濊瘯鑾峰彇瀛楁瀵瑰簲鐨刲abel锛堜紭鍏堝彇绗竴涓嚭鐜扮殑label锛�
+ let label=field;
+ title.forEach(item=>{
+ if(field==item.column){
+ label=item.alias
+ }
+ })
+ return {
+ title: label,
+ field: `otherColumnsJson.${field}`,
+ width: 120,
+ align: 'center',
+ // 澶勭悊瀛楁鍊兼樉绀猴紙鍏煎鏁扮粍/瀵硅薄绫诲瀷鐨刼therColumns锛�
+ formatter: ({ row }) => {
+ return row.otherColumnsJson?.[field] || '';
+
+ }
+ };
+ });
+
+ // 3. 瀹氫箟鐖剁骇鍒梡rocessList锛屽寘鍚姩鎬佸瓙鍒�
+ const processList = {
+ title: t('鍏朵粬鍒�'),
+ field: 'process',
+ children: otherColumns // 灏嗗姩鎬佸垪浣滀负瀛愬垪
+ };
+
+ // 4. 鍏堢Щ闄ゅ凡瀛樺湪鐨刾rocess鍒楋紙閬垮厤閲嶅锛夛紝鍐嶆坊鍔犳柊鍒�
+ gridOptions.columns = gridOptions.columns.filter(col => col.field !== 'process');
+ gridOptions.columns.push(processList);
+}
+
+
watch(props, (newVal) => {
@@ -180,6 +245,12 @@
basicProp.value.pageTotal = res.data.total.pageTotal
basicProp.value.dataTotal = res.data.total.total
orderInfo.reportFormDate = res.data.selectDate
+
+ //璁㈠崟鏄庣粏鎶ヨ〃
+ if (props.childrenData.url === '/order/getOrderReport') {
+ const dataList = res.data.data || [];
+ handleDynamicColumns(dataList,res.data.title)
+ }
}
})
return
@@ -190,6 +261,8 @@
basicProp.value.pageTotal = res.data.total.pageTotal
basicProp.value.dataTotal = res.data.total.total
orderInfo.reportFormDate = res.data.selectDate
+
+
}
})
}
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue b/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue
index eb4b21c..0699452 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue
@@ -3,6 +3,7 @@
import { ref} from "vue"
import request from "@/utils/request"
import {useI18n} from "vue-i18n";
+import {filterChanged} from "@/hook";
const { t } = useI18n()
const childrenData = ref({
@@ -17,7 +18,7 @@
{field: 'productId',width:120, title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'productName',width:120, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'orderNumber',width:120, title: t('order.OrderNum'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- // {field: 'buildingNumber',width:120, title: '妤煎彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'buildingNumber',width:120, title: t('order.buildingNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'width',width:120, title: t('order.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'height',width:120, title: t('order.height'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'quantity',width:120, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderDTO.java
index d593aca..67b2206 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderDTO.java
@@ -15,6 +15,8 @@
private String productName;
@ExcelProperty("璁㈠崟搴忓彿")
private Integer orderNumber;
+ @ExcelProperty("妤煎眰缂栧彿")
+ private String buildingNumber;
@ExcelProperty("瀹�")
private Double width;
@ExcelProperty("楂�")
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
index f9999cb..967d760 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
@@ -12,6 +12,7 @@
import java.time.LocalDate;
import java.util.List;
+import java.util.Map;
@Data
@TableName("sd.`order_detail`")
@@ -86,6 +87,8 @@
private Integer landingSequence;
@TableField(exist= false,select = false)
private Double thickness;
+ @TableField(exist= false,select = false)
+ private Map<String, Object> otherColumnsJson;
//鐢ㄤ簬鏅鸿兘鍒嗘灦
@TableField(exist= false,select = false)
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 0437ed0..7075172 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
@@ -49,8 +49,10 @@
private final WorkOrderMapper workOrderMapper;
private final FlowCardMapper flowCardMapper;
+ private final BasicOtherMoneyMapper basicOtherMoneyMapper;
+
private final OrderProcessDetailMapper orderProcessDetailMapper;
- public OrderService(OrderMapper orderMapper, OrderDetailMapper orderDetailMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, SysErrorService sysErrorService, OrderOtherMoneyMapper orderOtherMoneyMapper, ProductMapper productMapper, LogService logService, WorkOrderMapper workOrderMapper, FlowCardMapper flowCardMapper) {
+ public OrderService(OrderMapper orderMapper, OrderDetailMapper orderDetailMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, SysErrorService sysErrorService, OrderOtherMoneyMapper orderOtherMoneyMapper, ProductMapper productMapper, LogService logService, WorkOrderMapper workOrderMapper, FlowCardMapper flowCardMapper, BasicOtherMoneyMapper basicOtherMoneyMapper) {
this.orderMapper = orderMapper;
this.orderDetailMapper = orderDetailMapper;
this.orderGlassDetailMapper = orderGlassDetailMapper;
@@ -61,6 +63,7 @@
this.logService = logService;
this.workOrderMapper = workOrderMapper;
this.flowCardMapper = flowCardMapper;
+ this.basicOtherMoneyMapper = basicOtherMoneyMapper;
}
public boolean saveOrder(Map<String,Object> orderMap) throws Exception {
@@ -604,8 +607,28 @@
endDate = selectDate.get(1);
}
}
+ List<OrderDetail> orderDetailList = orderDetailMapper.getOrderReport(offset, pageSize, startDate, endDate, orderDetail,model,scope);
+ List<BasicOtherMoney> basicOtherMoneyList=basicOtherMoneyMapper.selectList(new QueryWrapper<BasicOtherMoney>());
+ ObjectMapper objectMapper = new ObjectMapper();
+
+ for (OrderDetail detail : orderDetailList) {
+ String otherColumnsStr = detail.getOtherColumns();
+ if (otherColumnsStr == null || otherColumnsStr.trim().isEmpty()||otherColumnsStr.equals("{}")) {
+ continue; // 璺宠繃绌哄��
+ }
+ try {
+ // 瑙ｆ瀽涓篗ap锛堜篃鍙В鏋愪负鑷畾涔夊疄浣撶被锛屽OtherColumnsDTO锛�
+ Map<String, Object> otherColumnsJson = objectMapper.readValue(otherColumnsStr, Map.class);
+
+ detail.setOtherColumnsJson(otherColumnsJson);
+ } catch (JsonProcessingException e) {
+ System.err.println("瑙ｆ瀽otherColumns澶辫触锛屾暟鎹細" + otherColumnsStr + "锛岄敊璇細" + e.getMessage());
+ }
+ }
+
Map<String,Object> map = new HashMap<>();
- map.put("data",orderDetailMapper.getOrderReport(offset, pageSize, startDate, endDate, orderDetail,model,scope));
+ map.put("data",orderDetailList);
+ map.put("title",basicOtherMoneyList);
map.put("total",orderDetailMapper.getOrderReportTotal(offset, pageSize, startDate, endDate, orderDetail,"order"));
List<String> list = new ArrayList<>();
list.add(startDate);
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
index 6dee99b..b67e7b1 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -320,6 +320,10 @@
and a.order_number like concat('%',#{orderDetail.orderNumber},'%')
</if>
+ <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
+ and a.building_number like concat('%',#{orderDetail.buildingNumber},'%')
+ </if>
+
<if test="orderDetail.width != null and orderDetail.width != '' and model==0">
and a.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
</if>
@@ -478,6 +482,10 @@
and a.order_number like concat('%',#{orderDetail.orderNumber},'%')
</if>
+ <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
+ and a.building_number like concat('%',#{orderDetail.buildingNumber},'%')
+ </if>
+
<if test="orderDetail.width != null and orderDetail.width != ''">
and a.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
</if>
--
Gitblit v1.8.0