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

优化

Browse Source
This commit is contained in:
zds
2022-12-05 12:03:33 +08:00
parent 65f6da2675
commit 49394c8c36
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java
View File

@@ -139,31 +139,31 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
JSONArray rows = new JSONArray();
JSONArray mater_rows = WQL.getWO("statistical_report_query_01").addParam("flag", "3").process().getResultJSONArray(0);
JSONObject jo1 = new JSONObject();
jo1.put("1", "库存现存量");
jo1.put("first", "库存现存量");
rows.add(jo1);
JSONObject jo22 = new JSONObject();
jo22.put("1", "已开单重量");
jo22.put("first", "已开单重量");
rows.add(jo22);
JSONObject jo2 = new JSONObject();
jo2.put("1", "排产需求量");
jo2.put("first", "排产需求量");
rows.add(jo2);
JSONObject jo3 = new JSONObject();
jo3.put("1", "库/需差额量");
jo3.put("first", "库/需差额量");
rows.add(jo3);
JSONObject jo4 = new JSONObject();
jo4.put("1", "待检入库量");
jo4.put("first", "待检入库量");
rows.add(jo4);
JSONObject jo5 = new JSONObject();
jo5.put("1", "覆盖日期");
jo5.put("first", "覆盖日期");
rows.add(jo5);
JSONObject jo6 = new JSONObject();
jo6.put("1", "合同在途");
jo6.put("first", "合同在途");
rows.add(jo6);
JSONObject jo7 = new JSONObject();
jo7.put("1", "最低储备定额");
jo7.put("first", "最低储备定额");
rows.add(jo7);
JSONObject jo8 = new JSONObject();
jo8.put("1", "采购缺口");
jo8.put("first", "采购缺口");
rows.add(jo8);
//汇总所有配方明细物料
@@ -241,7 +241,10 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
JSONObject map = new JSONObject();
map.put("flag", "4");
map.put("ext_id", jsonMater.getString("ext_id"));
//JSONObject num_jo = null;
JSONObject num_jo = WQL.getWO("QL_ERP").addParamMap(map).setDbname("dataSource1").process().uniqueResult(0);
//合同在途
double notqty = 0;
if (ObjectUtil.isNotEmpty(num_jo)) {
@@ -351,7 +354,7 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
JSONArray jsonArr = WQL.getWO("statistical_report_query_01").addParam("flag", "3").process().getResultJSONArray(0);
JSONArray jonsResuftArr = new JSONArray();
JSONObject jsonResuft1 = new JSONObject();
jsonResuft1.put("prop", "1");
jsonResuft1.put("prop", "first");
jsonResuft1.put("label", "统计项点");
jonsResuftArr.add(jsonResuft1);
for (int i = 0; i < jsonArr.size(); i++) {

10
mes/qd/src/views/wms/statistics/materPlan/index.vue
View File

@@ -49,8 +49,12 @@
>
<el-table-column type="index" label="序号" width="100" align="center" fixed />
<template v-for="(col,index) in cols">
<el-table-column v-if="col.prop !== '1'" :prop="col.prop" :label="col.label" width="120px" />
<el-table-column v-if="col.prop === '1'" :prop="col.prop" :label="col.label" width="120px" fixed />
<el-table-column v-if="col.prop !== 'first'" :prop="col.prop" :label="col.label" width="120px" />
<el-table-column v-if="col.prop === 'first'" :prop="col.prop" :label="col.label" width="120px" fixed>
<template slot-scope="scope">
<el-link type="warning" @click="open2()">{{ scope.row.first }}</el-link>
</template>
</el-table-column>
</template>
</el-table>
@@ -160,6 +164,8 @@ export default {
})
return true
},
open2() {
},
hand(value) {
this.crud.toQuery()
},