From 4781f3bb72bdd16ce16691cd59e8cbf5ff2e2507 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Wed, 22 Feb 2023 11:02:07 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=90=88=E5=90=8C=E5=9C=A8=E9=80=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/nl/wms/ql/wql/QL_ERP.wql    |  7 ++-
 .../wms/statistics/materPlan/StructIvt3.vue   | 46 +++++++++++++------
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql
index 28fb4497..f1bc4eaf 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql
@@ -147,7 +147,10 @@
                     sum(PURCHASE.QTY_HT) AS sumqty,
                     PURCHASE.VBILLCODE AS receive_code,
                     PURCHASE.ITEM_CODE as material_code,
-                    PURCHASE.ITEM_NAME as material_name
+                    PURCHASE.ITEM_NAME as material_name,
+                    PURCHASE.NAME,
+                    PURCHASE.NORIGTAXPRICE,
+                    PURCHASE.NORIGTAXMNY
                 FROM
                     PURCHASE_CONTRACT_VIEW PURCHASE
                 where
@@ -159,7 +162,7 @@
                      OPTION 输入.mater_ids <> ""
                           PURCHASE.ITEM_ID in 输入.mater_ids
                     ENDOPTION
-                   GROUP BY PURCHASE.ITEM_ID,PURCHASE.VBILLCODE, PURCHASE.ITEM_CODE, PURCHASE.ITEM_NAME
+                   GROUP BY PURCHASE.ITEM_ID,PURCHASE.VBILLCODE, PURCHASE.ITEM_CODE, PURCHASE.ITEM_NAME,PURCHASE.NAME,PURCHASE.NORIGTAXPRICE,PURCHASE.NORIGTAXMNY
                    ORDER BY PURCHASE.ITEM_CODE, PURCHASE.VBILLCODE
                 ENDSELECT
             ENDQUERY
diff --git a/mes/qd/src/views/wms/statistics/materPlan/StructIvt3.vue b/mes/qd/src/views/wms/statistics/materPlan/StructIvt3.vue
index 958f7155..56c9a725 100644
--- a/mes/qd/src/views/wms/statistics/materPlan/StructIvt3.vue
+++ b/mes/qd/src/views/wms/statistics/materPlan/StructIvt3.vue
@@ -1,9 +1,9 @@
 <template>
   <el-dialog
+    v-loading.fullscreen.lock="fullscreenLoading"
     append-to-body
     title="合同在途"
     :visible.sync="dialogVisible"
-    v-loading.fullscreen.lock="fullscreenLoading"
     destroy-on-close
     :show-close="false"
     fullscreen
@@ -13,20 +13,20 @@
     <el-row :gutter="20">
       <el-col :span="20" style="border: 1px solid white">
         物料:<el-select
-        v-model="queryrow.material_id"
-        clearable
-        size="mini"
-        placeholder="请选择物料"
-        style="width: 200px"
-        class="filter-item"
-        @change="MyQuery"
-      >
-        <el-option
-          v-for="item in XLList"
-          :key="item.material_id"
-          :label="item.material_name"
-          :value="item.material_id"
-        />
+          v-model="queryrow.material_id"
+          clearable
+          size="mini"
+          placeholder="请选择物料"
+          style="width: 200px"
+          class="filter-item"
+          @change="MyQuery"
+        >
+          <el-option
+            v-for="item in XLList"
+            :key="item.material_id"
+            :label="item.material_name"
+            :value="item.material_id"
+          />
         </el-select>
       </el-col>
       <el-col :span="4">
@@ -56,6 +56,9 @@
       <el-table-column prop="material_name" label="物料名称" min-width="150" />
       <el-table-column prop="sumqty" label="合同重量" min-width="100" :formatter="crud.formatNum2" />
       <el-table-column prop="notqty" label="在途重量" min-width="100" :formatter="crud.formatNum2" />
+      <el-table-column prop="NORIGTAXPRICE" label="含税单价" min-width="100" :formatter="crud.formatNum2" />
+      <el-table-column prop="NORIGTAXMNY" label="金额" min-width="100" :formatter="crud.formatNum2" />
+      <el-table-column prop="NAME" label="供应商" min-width="100" :formatter="crud.formatNum2" />
     </el-table>
   </el-dialog>
 </template>
@@ -173,6 +176,19 @@ export default {
           sums[index] = parseFloat(total).toFixed(3)
           sums[index]
         }
+
+        if (column.property === 'NORIGTAXMNY') {
+          const total = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] = parseFloat(total).toFixed(3)
+          sums[index]
+        }
       })
       return sums
     },