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

外协页面修改

Browse Source
This commit is contained in:
zhangzhiqiang
2022-12-29 10:29:02 +08:00
parent 5194d45e71
commit 8cb1e55dce
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,7 +73,7 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
map.put("is_send0", "0"); map.put("is_send0", "0");
} }
map.put("flag", "5"); map.put("flag", "5");
JSONObject jo = WQL.getWO("statistical_report_query_02").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "send_date desc,material_code,pcsn"); JSONObject jo = WQL.getWO("statistical_report_query_02").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "send_date,material_code,pcsn");
return jo; return jo;
} }

6
mes/qd/src/views/wms/statistics/sendOutQuery/index.vue
View File

@@ -138,7 +138,7 @@
<el-table-column prop="org_id" label="所属组织" width="120px" :formatter="orgFormat" /> <el-table-column prop="org_id" label="所属组织" width="120px" :formatter="orgFormat" />
<el-table-column prop="material_code" label="物料编码" width="120px" /> <el-table-column prop="material_code" label="物料编码" width="120px" />
<el-table-column prop="pcsn" label="批次" min-width="100" /> <el-table-column prop="pcsn" label="批次" min-width="100" />
<el-table-column prop="workorder_qty" label="重量" width="150px" /> <el-table-column :formatter="crud.formatNum3" prop="workorder_qty" label="重量" width="150px" />
<el-table-column prop="workorder_status" label="工令状态" width="150px" :formatter="stateFormat" /> <el-table-column prop="workorder_status" label="工令状态" width="150px" :formatter="stateFormat" />
<el-table-column prop="storagevehicle_code" label="托盘号" /> <el-table-column prop="storagevehicle_code" label="托盘号" />
<el-table-column prop="num_bucket" label="桶数" /> <el-table-column prop="num_bucket" label="桶数" />
@@ -175,7 +175,7 @@ export default {
return CRUD({ return CRUD({
title: '外协发货查询', title: '外协发货查询',
url: 'api/statistical/sendOutQuery', url: 'api/statistical/sendOutQuery',
idField: 'inspection_id', idField: 'diskrecord_id',
sort: '', sort: '',
props: { props: {
// 每页数据条数 // 每页数据条数
@@ -267,7 +267,7 @@ export default {
return '已出库' return '已出库'
} else if (row.is_send === '0') { } else if (row.is_send === '0') {
return '未出库' return '未出库'
} else{ } else {
return '' return ''
} }
}, },