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

Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-09-30 17:26:57 +08:00
parent 2ec8e0c957 167ba5ca35
commit 4ae6106bf1
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/ProductProcessParamServiceImpl.java
View File

@@ -113,12 +113,12 @@ public class ProductProcessParamServiceImpl implements ProductProcessParamServic
json1.put("prop", "material_code");
json1.put("label", "物料编码");
json1.put("isVisiable", true);
result.add(json1);
// result.add(json1);
JSONObject json2 = new JSONObject();
json2.put("prop", "material_name");
json2.put("label", "物料名称");
json2.put("isVisiable", true);
result.add(json2);
// result.add(json2);
for (int i = 0; i < rows.size(); i++) {
JSONObject jsonObject = rows.getJSONObject(i);

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

@@ -166,7 +166,7 @@ public class PhysicalQueryServiceImpl implements PhysicalQueryService {
// jsonResultArr.add(jsonResult2);
// jsonResultArr.add(jsonResult20);
jsonResultArr.add(jsonResult21);
jsonResultArr.add(jsonResult3);
// jsonResultArr.add(jsonResult3);
jsonResultArr.add(jsonResult4);
jsonResultArr.add(jsonResult5);
for (int j = 0; j < jsonPointArr.size(); j++) {

3
mes/qd/src/views/wms/basedata/pdm/productProcessParam/index.vue
View File

@@ -24,6 +24,9 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="material_code" label="物料编码" min-width="100" show-overflow-tooltip fixed />
<el-table-column prop="material_name" label="物料名称" min-width="100" show-overflow-tooltip fixed />
<template v-for="(col,index) in cols">
<el-table-column v-if="col.isVisiable" :prop="col.prop" :label="col.label" width="130px" show-overflow-tooltip />
</template>

1
mes/qd/src/views/wms/statistics/phySicalQuery/index.vue
View File

@@ -128,6 +128,7 @@
<el-table-column prop="0" label="质检单号" min-width="100" show-overflow-tooltip fixed />
<el-table-column prop="1" label="物料编码" min-width="100" show-overflow-tooltip fixed />
<el-table-column prop="20" label="物料名称" min-width="100" show-overflow-tooltip fixed />
<el-table-column prop="2" label="批号" min-width="100" show-overflow-tooltip fixed />
<template v-for="(col,index) in cols">
<el-table-column v-if="col" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip />
</template>