From a7b15461d3dc6d07c18e065fa3a6acd234c2d7c8 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期二, 09 十二月 2025 19:51:55 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/extension/stock/stockView.js | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/stock/stockView.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/stock/stockView.js"
index 6e73be0..c58c825 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/stock/stockView.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/stock/stockView.js"
@@ -93,28 +93,42 @@
column.formatter = (row) => {
// 鏍￠獙details鏄惁瀛樺湪涓旀湁鏁版嵁
if (row.details && row.details.length > 0) {
- // 鎸塵aterielCode鍒嗙粍缁熻stockQuantity鎬诲拰锛屽苟璁板綍鍗曚綅锛堝彇绗竴涓潪绌哄崟浣嶏級
- const materielSumMap = row.details.reduce((acc, item) => {
- const materielCode = item.materielCode || '鏈煡鐗╂枡';
+ // 鎸塨arcode + supplyCode + BatchNo 缁勫悎缁村害鍒嗙粍缁熻stockQuantity鎬诲拰锛屽苟璁板綍鍗曚綅锛堝彇绗竴涓潪绌哄崟浣嶏級
+ const groupSumMap = row.details.reduce((acc, item) => {
+ // 鑾峰彇鍒嗙粍鍏抽敭瀛楁锛屼负绌烘椂璧嬩簣榛樿鍊�
+ const supplyCode = item.supplyCode || '鏈煡渚涘簲鍟嗙紪鐮�';
+ const batchNo = item.batchNo || '鏈煡鎵规鍙�';
+ const materielCode = item.materielCode || '鏈煡鐗╂枡'; // 淇濈暀鍘熸湁鐗╂枡缂栫爜
const quantity = Number(item.stockQuantity) || 0;
const unit = item.unit || ''; // 鑾峰彇鍗曚綅锛屾棤鍒欎负绌�
- // 绱姞鏁伴噺
- acc[materielCode] = {
- total: (acc[materielCode]?.total || 0) + quantity,
- unit: acc[materielCode]?.unit || unit // 淇濈暀绗竴涓潪绌哄崟浣�
+ // 缁勫悎鍒嗙粍閿紙鍙牴鎹渶瑕佽皟鏁存樉绀烘牸寮忥級
+ const groupKey = `${supplyCode}|${batchNo}|${materielCode}`;
+
+ // 绱姞鏁伴噺锛屼繚鐣欑涓�涓潪绌哄崟浣�
+ acc[groupKey] = {
+ total: (acc[groupKey]?.total || 0) + quantity,
+ unit: acc[groupKey]?.unit || unit,
+ supplyCode,
+ batchNo,
+ materielCode
};
return acc;
}, {});
- // 姣忎釜鐗╂枡椤圭敓鎴愮嫭绔媎iv锛岃法琛屾樉绀猴紙鍖呭惈鍗曚綅锛�
- const displayItems = Object.entries(materielSumMap).map(([code, data]) => {
+ // 姣忎釜鍒嗙粍椤圭敓鎴愮嫭绔媎iv锛岃法琛屾樉绀猴紙鍖呭惈鎵�鏈夊垎缁勭淮搴﹀拰鍗曚綅锛�
+ const displayItems = Object.entries(groupSumMap).map(([_, data]) => {
// 澶勭悊鍗曚綅鏄剧ず锛氭湁鍗曚綅鍒欏姞绌烘牸鏄剧ず锛屾棤鍒欎笉鏄剧ず
const unitText = data.unit ? ` ${data.unit}` : '';
- return `<div style="line-height: 1.5; white-space: normal;">${code}锛�${data.total}${unitText}</div>`;
+
+ // 缁勮鏄剧ず鏂囨湰锛堝彲鏍规嵁闇�姹傝皟鏁村瓧娈垫樉绀洪『搴忓拰鏍煎紡锛�
+ return `<div style="line-height: 1.5; white-space: normal; margin-bottom: 4px;">
+ 渚涘簲鍟嗙紪鐮侊細${data.supplyCode} | 鎵规鍙凤細${data.batchNo} | 鐗╂枡缂栫爜锛�${data.materielCode}锛�${data.total}${unitText}
+ </div>`;
});
+
const displayContent = displayItems.join('');
- return `<div style="color: #F56C6C; white-space: normal; word-break: break-all;">${displayContent}</div>`;
+ return `<div style="color: #716cf5ff; white-space: normal; word-break: break-all;">${displayContent}</div>`;
} else {
return '<span style="color: #F56C6C">绌虹</span>';
}
--
Gitblit v1.9.3