SQC修改

cclqms-java/src/main/java/com/gaotao/modules/pms/controller/QcController.java

@@ -1304,6 +1304,11 @@ public class QcController {
      **/
     @PostMapping("/queryPartList")
     public R queryPartList(@RequestBody QcFAIRecordData data){
+        // 传了 page/limit 时走分页，兼容原有全量查询
+        if (data.getPage() > 0 && data.getLimit() > 0) {
+            PageUtils page = qcService.queryPartListPage(data);
+            return R.ok().put("page", page).put("rows", page.getList());
+        }
         List<QcFAIRecordData> list = qcService.queryPartList(data);
         return R.ok().put("rows", list);
     }

cclqms-java/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java

@@ -240,6 +240,8 @@ public interface QcMapper {
 
     List<QcFAIRecordData> queryPartList(QcFAIRecordData data);
 
+    IPage<QcFAIRecordData> queryPartListPage(Page<QcFAIRecordData> page, @Param("query") QcFAIRecordData data);
+
     List<QcFAIRecordData> umSearch(QcFAIRecordData data);
 
     List<SubDetailValues> checkItem(SubDetailValues task);

cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java

@@ -2286,6 +2286,22 @@ public class QcServiceImpl implements QcService {
         return list;
     }
 
+    /**
+     * 查询物料集合（分页）
+     **/
+    @Override
+    public PageUtils queryPartListPage(QcFAIRecordData data) {
+        if (data.getBu() != null && data.getBu().split("_").length >= 2) {
+            data.setSite(data.getBu().split("_")[0]);
+            data.setBuNo(data.getBu().split("_")[1]);
+        } else {
+            throw new RuntimeException(pmsI18nHelper.text("pms.error.siteBu.invalid", null, "工厂和部门有误!"));
+        }
+        IPage<QcFAIRecordData> resultList = qcMapper.queryPartListPage(
+                new Page<>(data.getPage(), data.getLimit()), data);
+        return new PageUtils(resultList);
+    }
+
     /**
      * 查询单位列表
      **/
@@ -4946,7 +4962,8 @@ public class QcServiceImpl implements QcService {
     }
 
     private String resolveAutogenerateInspectionType(String inspectionTypeKey, String inspectionTypeNo) {
-        if ("IPQC".equalsIgnoreCase(inspectionTypeKey) || "SQC".equalsIgnoreCase(inspectionTypeKey)) {
+        //|| "SQC".equalsIgnoreCase(inspectionTypeKey)
+        if ("IPQC".equalsIgnoreCase(inspectionTypeKey) ) {
             if (StringUtils.isNotBlank(inspectionTypeNo)) {
                 if (inspectionTypeNo.startsWith("IPQC")) {
                     return inspectionTypeNo;

cclqms-java/src/main/java/com/gaotao/modules/pms/service/QcService.java

@@ -142,6 +142,8 @@ public interface QcService {
 
     List<QcFAIRecordData> queryPartList(QcFAIRecordData data);
 
+    PageUtils queryPartListPage(QcFAIRecordData data);
+
     List<QcFAIRecordData> umSearch(QcFAIRecordData data);
 
     Map<String, Integer> subDetailUpload(MultipartFile file, GetParamInData data);

cclqms-java/src/main/resources/mapper/pms/QcMapper.xml

@@ -2693,9 +2693,11 @@
         SELECT
         site,
         partNo,
-        PartDescription as part_desc,
+        PartDescription as partDesc,
+        PartType as invdefinetype,
         sku,
-        spec
+        spec,
+        cinv_source_code as cinvSourceCode
         FROM part
         <where>
             site = #{site}
@@ -2708,7 +2710,40 @@
             <if test = "sku != null and sku != ''">
                 AND sku LIKE '%' + #{sku} + '%'
             </if>
+            <if test = "cinvSourceCode != null and cinvSourceCode != ''">
+                AND cinv_source_code LIKE '%' + #{cinvSourceCode} + '%'
+            </if>
+        </where>
+        order by partNo
+    </select>
+
+    <!-- 查询物料列表（分页） -->
+    <select id="queryPartListPage" resultType="com.gaotao.modules.pms.data.QcFAIRecordData">
+        SELECT
+        site,
+        partNo,
+        PartDescription as partDesc,
+        PartType as invdefinetype,
+        sku,
+        spec,
+        cinv_source_code as cinvSourceCode
+        FROM part
+        <where>
+            site = #{query.site}
+            <if test = "query.partNo != null and query.partNo != ''">
+                AND partNo LIKE '%' + #{query.partNo} + '%'
+            </if>
+            <if test = "query.partDesc != null and query.partDesc != ''">
+                AND PartDescription LIKE '%' + #{query.partDesc} + '%'
+            </if>
+            <if test = "query.sku != null and query.sku != ''">
+                AND sku LIKE '%' + #{query.sku} + '%'
+            </if>
+            <if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
+                AND cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%'
+            </if>
         </where>
+        order by partNo
     </select>
 
     <!-- 查询单位列表 -->