From 4087fa05a86dd895ad963d5a03fcd6b906f97d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Thu, 9 Nov 2023 13:03:57 +0800
Subject: [PATCH] =?UTF-8?q?2023-11-09=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=92=8C?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xujie/sys/modules/pms/data/QcFAIRecordData.java    | 10 ----------
 .../sys/modules/pms/service/Impl/QcServiceImpl.java    |  9 ++++++++-
 src/main/resources/mapper/pms/QcMapper.xml             |  2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
index 5582eef2..f8ed2dc1 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
@@ -151,8 +151,6 @@ public class QcFAIRecordData extends QueryPage {
     private String batchRollNo;
     // 物料类别
     private String spec;
-    // 计量单位
-    private String umid;
     // 特殊要求
     private String specialRequirements;
     // 采购订单
@@ -210,14 +208,6 @@ public class QcFAIRecordData extends QueryPage {
         this.workCenterNo = workCenterNo;
     }
 
-    public String getUmid() {
-        return umid;
-    }
-
-    public void setUmid(String umid) {
-        this.umid = umid;
-    }
-
     public Integer getId() {
         return id;
     }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
index 472f90da..dbf6e2c3 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
@@ -2393,6 +2393,10 @@ public class QcServiceImpl implements QcService {
                     data.setInspectionCycle(partAttribute.get(0).getInspectionCycle());
                 }
                 // 获取抽样数量
+
+
+
+
                 // 如果该检验模板有维护抽样方案
                 if (StringUtils.isNotBlank(partAttribute.get(0).getSamplingProgrammeNo())) {
                     QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData();
@@ -2405,7 +2409,10 @@ public class QcServiceImpl implements QcService {
                             data.setSamplingQty(programmeData.getSamplingQty());
                         }
                     }
-                } else if (partAttribute.get(0).getDefaultSamplingQuantity() != null) {
+                }
+
+
+                else if (partAttribute.get(0).getDefaultSamplingQuantity() != null) {
                     // 没有维护抽样方案，再根据默认抽样数来确定
                     data.setSamplingQty(partAttribute.get(0).getDefaultSamplingQuantity());
                 } else if (partAttribute.get(0).getDefaultSamplingProportion() != null) {
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index f1fce409..81660e71 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -2026,7 +2026,7 @@
         inspection_cycle,
         part_no,
         part_desc,
-        dbo.qc_get_part_umid(site, part_no) as umid,
+        dbo.qc_get_part_umid(site, part_no) as umId,
         inspection_remark,
         roll_qty,
         sampling_qty,