Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbany...

heshaofeng

2026-01-13 d741e7a7ad7de5045e5c6b6145d9da1783cadecd

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js

@@ -53,7 +53,36 @@
          if (rows.length > 1) {
            return this.$Message.error("请选择一条数据");
          }
          this.http.post(`api/Inbound/BatchInOrderFeedbackToMes?id=${rows[0].id}`,{},"数据处理中...")
          this.http.post(`api/Inbound/BatchInOrderFeedbackToMes?id=${rows[0].id}`, {}, "数据处理中...")
            .then((x) => {
              if (x.status) {
                this.$Message.success(x.message);
                this.refresh();
              } else {
                return this.$Message.error(x.message);
              }
            })
            .catch((error) => {
              // å¢žåŠ å¼‚常捕获，处理网络错误等情况
              //_this.$Message.error('请求失败：' + (error.message || '未知错误'));
            });
        };
      }

      var CloseOrderBtn = this.buttons.find(
        (x) => x.value == "CloseOrder"
      );
      if (CloseOrderBtn != null) {
        CloseOrderBtn.onClick = () => {
          var rows = this.$refs.table.getSelected();
          // æ ¡éªŒæ˜¯å¦æœ‰é€‰ä¸­æ•°æ®
          if (!rows || rows.length === 0) {
            return this.$Message.error("请先选择需要关闭的单据");
          }
          if (rows.length > 1) {
            return this.$Message.error("请选择一条单据");
          }
          this.http.post(`api/InboundOrder/HandCloseOrder?orderIds=${rows[0].inboundOrderNo}`, {}, "数据处理中...")
            .then((x) => {
              if (x.status) {
                this.$Message.success(x.message);
@@ -81,18 +110,28 @@
          column.formatter = (row) => {
            // æ ¡éªŒdetails是否存在且有数据
            if (row.details && row.details.length > 0) {
              //按materielCode分组统计orderQuantity总和
              // æŒ‰materielCode分组，同时保存对应的materielName和统计orderQuantity总和
              const materielSumMap = row.details.reduce((acc, item) => {
                const materielName = item.materielName || "未知名称";
                const materielCode = item.materielCode || "未知物料";
                const quantity = Number(item.orderQuantity) || 0;
                acc[materielCode] = (acc[materielCode] || 0) + quantity;

                // æ ¸å¿ƒä¿®æ”¹ï¼šä¸å†åªå­˜æ•°é‡ï¼Œè€Œæ˜¯å­˜åŒ…含名称和数量的对象
                if (!acc[materielCode]) {
                  acc[materielCode] = {
                    name: materielName, // å­˜å‚¨ç‰©æ–™åç§°
                    total: 0 // å­˜å‚¨æ•°é‡æ€»å’Œ
                  };
                }
                acc[materielCode].total += quantity;
                return acc;
              }, {});

              //每个物料项生成独立div，跨行显示
              // æ¯ä¸ªç‰©æ–™é¡¹ç”Ÿæˆç‹¬ç«‹div，显示编码+名称+数量
              const displayItems = Object.entries(materielSumMap).map(
                ([code, total]) => {
                  return `<div style="line-height: 1.5; white-space: normal;">${code}：${total}个</div>`;
                ([code, data]) => {
                  // æ˜¾ç¤ºæ ¼å¼ï¼šç‰©æ–™ç¼–码（物料名称）：数量个
                  return `<div style="line-height: 1.5; white-space: normal;">${code}（${data.name}）：${data.total}个</div>`;
                }
              );
              const displayContent = displayItems.join("");