From e74385783464b858ec647caa0bb4ec618dce90fc Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 24 May 2024 11:49:50 +0800
Subject: [PATCH] =?UTF-8?q?2024-05-24=20=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/pms/controller/QcController.java     | 10 ++++++++++
 .../xujie/sys/modules/pms/data/QcFAIRecordData.java  |  9 +++++++++
 .../com/xujie/sys/modules/pms/mapper/QcMapper.java   |  2 ++
 .../sys/modules/pms/service/Impl/QcServiceImpl.java  | 10 ++++++++++
 .../com/xujie/sys/modules/pms/service/QcService.java |  2 ++
 src/main/resources/mapper/pms/QcMapper.xml           | 12 +++++++++++-
 6 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java
index 19de687c..b0f9554e 100644
--- a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java
+++ b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java
@@ -1769,6 +1769,16 @@ public class QcController {
         List<QcFAIRecordData> list = qcService.searchPartInfo(data);
         return R.ok().put("rows", list);
     }
+
+    /**
+     * 获取采购类型
+     * @return
+     */
+    @PostMapping("/orderTypeSearch")
+    public R orderTypeSearch(){
+        List<QcFAIRecordData> list = qcService.orderTypeSearch();
+        return R.ok().put("rows", list);
+    }
 }
 
 
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 4dd24a33..89911e7a 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
@@ -211,6 +211,15 @@ public class QcFAIRecordData extends QueryPage {
     private String updateBy;
     private String defaultWarehouseId;
     private String status;
+    private String orderType;
+
+    public String getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(String orderType) {
+        this.orderType = orderType;
+    }
 
     public String getStatus() {
         return status;
diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
index 28f814c5..e04974c0 100644
--- a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
+++ b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
@@ -472,4 +472,6 @@ public interface QcMapper {
     MailSendAddressData getSendMailFromAddress();
 
     void saveSendMailRecord(SendMailRecord mailRecord);
+
+    List<QcFAIRecordData> orderTypeSearch();
 }
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 febfd42e..9f6b8ac8 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
@@ -4556,6 +4556,16 @@ public class QcServiceImpl implements QcService {
         return list;
     }
 
+    /**
+     * 获取采购类型
+     * @return
+     */
+    @Override
+    public List<QcFAIRecordData> orderTypeSearch() {
+        List<QcFAIRecordData> list = qcMapper.orderTypeSearch();
+        return list;
+    }
+
     public static File multipartFileToFile(MultipartFile file ,String fileName) throws Exception {
         File toFile = null;
         if (file.equals("") || file.getSize() <= 0) {
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java
index de57c661..0d82628c 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java
@@ -274,4 +274,6 @@ public interface QcService {
     List<QcFAIRecordData> searchSeqInfo(QcFAIRecordData data);
 
     List<QcFAIRecordData> searchPartInfo(QcFAIRecordData data);
+
+    List<QcFAIRecordData> orderTypeSearch();
 }
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index ce74a166..85e983c4 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -2244,7 +2244,8 @@
         dbo.qc_get_supplier_name(site, supplier_no) as supplierDesc,
         po_orderNo,
         po_itemNo,
-        roll_count
+        roll_count,
+        dbo.qc_get_order_type(site, po_orderNo, po_itemNo) as orderType
         FROM qc_iqc_record
         <where>
             site in (select site from eam_access_site where username = #{query.userName})
@@ -2300,6 +2301,9 @@
             <if test = "query.poItemNo != null and query.poItemNo != ''">
                 AND po_itemNo LIKE '%' + #{query.poItemNo} + '%'
             </if>
+            <if test = "query.orderType != null and query.orderType != ''">
+                AND dbo.qc_get_order_type(site, po_orderNo, po_itemNo) = #{query.orderType}
+            </if>
         </where>
         ORDER BY
         CASE WHEN state = '待检验' THEN 1
@@ -3255,6 +3259,12 @@
         values
             (#{site}, #{buNo}, #{documentNo}, #{sender}, #{recipient}, getDate())
     </insert>
+
+    <select id="orderTypeSearch" resultType="QcFAIRecordData">
+        SELECT distinct
+            order_type
+        FROM view_po_order
+    </select>
 </mapper>