root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:合同在途

Browse Source
This commit is contained in:
zhangzhiqiang
2023-02-22 11:02:07 +08:00
parent c7350749cd
commit 4781f3bb72
2 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql
View File

@@ -147,7 +147,10 @@
sum(PURCHASE.QTY_HT) AS sumqty, sum(PURCHASE.QTY_HT) AS sumqty,
PURCHASE.VBILLCODE AS receive_code, PURCHASE.VBILLCODE AS receive_code,
PURCHASE.ITEM_CODE as material_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 FROM
PURCHASE_CONTRACT_VIEW PURCHASE PURCHASE_CONTRACT_VIEW PURCHASE
where where
@@ -159,7 +162,7 @@
OPTION 输入.mater_ids <> "" OPTION 输入.mater_ids <> ""
PURCHASE.ITEM_ID in 输入.mater_ids PURCHASE.ITEM_ID in 输入.mater_ids
ENDOPTION 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 ORDER BY PURCHASE.ITEM_CODE, PURCHASE.VBILLCODE
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY

46
mes/qd/src/views/wms/statistics/materPlan/StructIvt3.vue
View File

@@ -1,9 +1,9 @@
<template> <template>
<el-dialog <el-dialog
v-loading.fullscreen.lock="fullscreenLoading"
append-to-body append-to-body
title="合同在途" title="合同在途"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
v-loading.fullscreen.lock="fullscreenLoading"
destroy-on-close destroy-on-close
:show-close="false" :show-close="false"
fullscreen fullscreen
@@ -13,20 +13,20 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="20" style="border: 1px solid white"> <el-col :span="20" style="border: 1px solid white">
物料:<el-select 物料:<el-select
v-model="queryrow.material_id" v-model="queryrow.material_id"
clearable clearable
size="mini" size="mini"
placeholder="请选择物料" placeholder="请选择物料"
style="width: 200px" style="width: 200px"
class="filter-item" class="filter-item"
@change="MyQuery" @change="MyQuery"
> >
<el-option <el-option
v-for="item in XLList" v-for="item in XLList"
:key="item.material_id" :key="item.material_id"
:label="item.material_name" :label="item.material_name"
:value="item.material_id" :value="item.material_id"
/> />
</el-select> </el-select>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
@@ -56,6 +56,9 @@
<el-table-column prop="material_name" label="物料名称" min-width="150" /> <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="sumqty" label="合同重量" min-width="100" :formatter="crud.formatNum2" />
<el-table-column prop="notqty" 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-table>
</el-dialog> </el-dialog>
</template> </template>
@@ -173,6 +176,19 @@ export default {
sums[index] = parseFloat(total).toFixed(3) sums[index] = parseFloat(total).toFixed(3)
sums[index] 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 return sums
}, },