From 959a6d59aa85702139282e2632acf0d7f55e0971 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 30 Jul 2024 17:55:54 +0800
Subject: [PATCH] =?UTF-8?q?2024-07-30=20OMS=E6=8A=A5=E8=A1=A82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xujie/sys/modules/pms/data/QcReportData.java     | 4 ++++
 src/main/resources/mapper/pms/QcReportMapper.xml         | 9 ++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcReportData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcReportData.java
index 679ffbf..6f6722f 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/QcReportData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/QcReportData.java
@@ -280,4 +280,8 @@ public class QcReportData extends QueryPage {
      * 创建人
      */
     private String createBy;
+    /**
+     * 加工中心
+     */
+    private String workCenterNo;
 }
diff --git a/src/main/resources/mapper/pms/QcReportMapper.xml b/src/main/resources/mapper/pms/QcReportMapper.xml
index aa02977..3eee3e1 100644
--- a/src/main/resources/mapper/pms/QcReportMapper.xml
+++ b/src/main/resources/mapper/pms/QcReportMapper.xml
@@ -51,7 +51,7 @@
             b.sampling_qty as itemSamplingQty,
             b.unqualified_quantity,
             CASE WHEN b.value_type_db = 'T' THEN b.text_value
-            WHEN b.value_type_db = 'N' THEN b.number_value
+            WHEN b.value_type_db = 'N' THEN CONVERT(varchar, b.number_value, 126)
             END as textValue
         FROM qc_iqc_record as a
         LEFT JOIN qc_iqc_detailed_record b ON a.site = b.site AND a.bu_no = b.bu_no AND a.inspection_no = b.inspection_no
@@ -159,7 +159,6 @@
             a.disposal_measures,
             a.disposal_remark,
             a.inspector_date,
-            a.unqualified_qty,
             dbo.qc_get_spec(a.part_no) as spec,
             a.seq_no,
             a.batch_roll_no,
@@ -180,7 +179,7 @@
             b.sampling_qty as itemSamplingQty,
             b.unqualified_quantity,
             CASE WHEN b.value_type_db = 'T' THEN b.text_value
-            WHEN b.value_type_db = 'N' THEN b.number_value
+            WHEN b.value_type_db = 'N' THEN CONVERT(varchar, b.number_value, 126)
             END as textValue
         FROM qc_ipqc_record as a
         LEFT JOIN qc_ipqc_detailed_record b ON a.site = b.site AND a.bu_no = b.bu_no AND a.inspection_no = b.inspection_no
@@ -288,7 +287,7 @@
             b.sampling_qty as itemSamplingQty,
             b.unqualified_quantity,
             CASE WHEN b.value_type_db = 'T' THEN b.text_value
-            WHEN b.value_type_db = 'N' THEN b.number_value
+            WHEN b.value_type_db = 'N' THEN CONVERT(varchar, b.number_value, 126)
             END as textValue
         FROM qc_stock_record as a
         LEFT JOIN qc_stock_detailed_record b ON a.site = b.site AND a.bu_no = b.bu_no AND a.inspection_no = b.inspection_no
@@ -403,7 +402,7 @@
             b.sampling_qty as itemSamplingQty,
             b.unqualified_quantity,
             CASE WHEN b.value_type_db = 'T' THEN b.text_value
-            WHEN b.value_type_db = 'N' THEN b.number_value
+            WHEN b.value_type_db = 'N' THEN CONVERT(varchar, b.number_value, 126)
             END as textValue
         FROM qc_stock_record as a
         LEFT JOIN qc_stock_detailed_record b ON a.site = b.site AND a.bu_no = b.bu_no AND a.inspection_no = b.inspection_no