diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java index 8ed000a3..e61881c9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java @@ -73,7 +73,7 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { map.put("is_send0", "0"); } 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; } diff --git a/mes/qd/src/views/wms/statistics/sendOutQuery/index.vue b/mes/qd/src/views/wms/statistics/sendOutQuery/index.vue index 34987e98..f5aa171d 100644 --- a/mes/qd/src/views/wms/statistics/sendOutQuery/index.vue +++ b/mes/qd/src/views/wms/statistics/sendOutQuery/index.vue @@ -138,7 +138,7 @@ - + @@ -175,7 +175,7 @@ export default { return CRUD({ title: '外协发货查询', url: 'api/statistical/sendOutQuery', - idField: 'inspection_id', + idField: 'diskrecord_id', sort: '', props: { // 每页数据条数 @@ -267,7 +267,7 @@ export default { return '已出库' } else if (row.is_send === '0') { return '未出库' - } else{ + } else { return '' } },