From 8cb1e55dce070a8a6542682d70f5056f4e71dc33 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Thu, 29 Dec 2022 10:29:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StatisticalReportServiceImpl.java          | 2 +-
 mes/qd/src/views/wms/statistics/sendOutQuery/index.vue      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

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 @@
         <el-table-column prop="org_id" label="所属组织" width="120px" :formatter="orgFormat" />
         <el-table-column prop="material_code" label="物料编码" width="120px" />
         <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="storagevehicle_code" label="托盘号" />
         <el-table-column prop="num_bucket" label="桶数" />
@@ -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 ''
       }
     },