From 75c4b8226922c9f56d987d2ba3576a977b911450 Mon Sep 17 00:00:00 2001
From: shenzhouyu <zhouyu.shen@xujiesoft.com>
Date: Mon, 1 Jun 2026 14:30:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pms/controller/QcController.java  |  9 +++++++++
 .../data/QcSamplingInspectionPlanData.java    | 19 +++----------------
 .../service/Impl/QcBaseInfoServiceImpl.java   | 10 ++++++++++
 .../pms/service/QcBaseInfoService.java        |  3 +++
 .../resources/mapper/pms/QcBaseInfoMapper.xml |  1 +
 5 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/cclqms-java/src/main/java/com/gaotao/modules/pms/controller/QcController.java b/cclqms-java/src/main/java/com/gaotao/modules/pms/controller/QcController.java
index 1af9181..21f6030 100644
--- a/cclqms-java/src/main/java/com/gaotao/modules/pms/controller/QcController.java
+++ b/cclqms-java/src/main/java/com/gaotao/modules/pms/controller/QcController.java
@@ -459,6 +459,15 @@ public class QcController {
         return R.ok();
     }
 
+    /**
+     * 物料目录数据同步（存储过程 UspSyncPartCatalog）
+     */
+    @PostMapping("/qcPartCatalogSync")
+    public R qcPartCatalogSync(){
+        qcBaseInfoService.syncPartCatalog();
+        return R.ok();
+    }
+
     @PostMapping("/qcSpecSearch")
     public R qcSpecSearch(@RequestBody QcSpecData data){
         List<QcSpecData> list = qcBaseInfoService.qcSpecSearch(data);
diff --git a/cclqms-java/src/main/java/com/gaotao/modules/pms/data/QcSamplingInspectionPlanData.java b/cclqms-java/src/main/java/com/gaotao/modules/pms/data/QcSamplingInspectionPlanData.java
index 1ca0ad9..16ed233 100644
--- a/cclqms-java/src/main/java/com/gaotao/modules/pms/data/QcSamplingInspectionPlanData.java
+++ b/cclqms-java/src/main/java/com/gaotao/modules/pms/data/QcSamplingInspectionPlanData.java
@@ -2,6 +2,7 @@ package com.gaotao.modules.pms.data;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gaotao.common.utils.QueryPage;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
@@ -13,6 +14,7 @@ import java.util.Date;
  * @param:
  * @return:
  **/
+@Data
 public class QcSamplingInspectionPlanData extends QueryPage {
     // 工厂号
     private String site;
@@ -29,7 +31,7 @@ public class QcSamplingInspectionPlanData extends QueryPage {
     private String samplingQtyDesc;
 
     // 抽样量级别编码
-    private Integer samplingQtyRankNo;
+    private String samplingQtyRankNo;
     // 抽样量级别名称
     private String samplingQtyRankDesc;
     // 最小抽样量
@@ -202,21 +204,6 @@ public class QcSamplingInspectionPlanData extends QueryPage {
         this.site = site;
     }
 
-    public Integer getSamplingQtyRankNo() {
-        return samplingQtyRankNo;
-    }
-
-    public void setSamplingQtyRankNo(Integer samplingQtyRankNo) {
-        this.samplingQtyRankNo = samplingQtyRankNo;
-    }
-
-    public String getSamplingLevelNo() {
-        return samplingLevelNo;
-    }
-
-    public void setSamplingLevelNo(String samplingLevelNo) {
-        this.samplingLevelNo = samplingLevelNo;
-    }
 
     public String getSamplingQtyNo() {
         return samplingQtyNo;
diff --git a/cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java b/cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java
index 841fcca..9a51a14 100644
--- a/cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java
+++ b/cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java
@@ -13,6 +13,7 @@ import com.gaotao.modules.pms.entity.vo.PartInformationVo;
 import com.gaotao.modules.pms.entity.vo.PartLabelTemplateVo;
 import com.gaotao.modules.pms.mapper.QcBaseInfoMapper;
 import com.gaotao.modules.pms.service.QcBaseInfoService;
+import com.gaotao.modules.report.dao.ProcedureDao;
 import com.gaotao.modules.pms.util.BuResolveUtil;
 import com.gaotao.modules.pms.util.PmsI18nHelper;
 import com.gaotao.modules.sys.entity.SysUserEntity;
@@ -43,6 +44,8 @@ public class QcBaseInfoServiceImpl implements QcBaseInfoService {
     private QcBaseInfoMapper qcBaseInfoMapper;
     @Autowired
     private PmsI18nHelper pmsI18nHelper;
+    @Autowired
+    private ProcedureDao procedureDao;
 
     // ======================= 检验方法 =======================
 
@@ -1029,6 +1032,13 @@ public class QcBaseInfoServiceImpl implements QcBaseInfoService {
         qcBaseInfoMapper.qcPartAttributeEdit(data);
     }
 
+    @Override
+    public void syncPartCatalog() {
+        List<Object> params = Collections.singletonList("*");
+        procedureDao.execProduceData("UspSyncPartCatalog", params);
+        log.info("UspSyncPartCatalog executed with param *");
+    }
+
     @Override
     public List<QcSpecData> qcSpecSearch(QcSpecData data) {
         return qcBaseInfoMapper.qcSpecSearch(data);
diff --git a/cclqms-java/src/main/java/com/gaotao/modules/pms/service/QcBaseInfoService.java b/cclqms-java/src/main/java/com/gaotao/modules/pms/service/QcBaseInfoService.java
index 01e552e..1553249 100644
--- a/cclqms-java/src/main/java/com/gaotao/modules/pms/service/QcBaseInfoService.java
+++ b/cclqms-java/src/main/java/com/gaotao/modules/pms/service/QcBaseInfoService.java
@@ -113,6 +113,9 @@ public interface QcBaseInfoService {
 
     void qcPartAttributeEdit(PartInformationVo data);
 
+    /** 调用存储过程 UspSyncPartCatalog 同步物料目录 */
+    void syncPartCatalog();
+
     List<QcSpecData> qcSpecSearch(QcSpecData data);
     
     void qcSpecSave(QcSpecData data);
diff --git a/cclqms-java/src/main/resources/mapper/pms/QcBaseInfoMapper.xml b/cclqms-java/src/main/resources/mapper/pms/QcBaseInfoMapper.xml
index eed81e6..a972394 100644
--- a/cclqms-java/src/main/resources/mapper/pms/QcBaseInfoMapper.xml
+++ b/cclqms-java/src/main/resources/mapper/pms/QcBaseInfoMapper.xml
@@ -378,6 +378,7 @@
                 AND qsip.sampling_plan_active = #{query.samplingPlanActive}
             </if>
         </where>
+        order by qsip.sampling_plan_no desc
     </select>
 
     <!-- 根据三个编码查矩阵 -->