2023-11-07，设备和质量修改2

src/main/java/com/xujie/sys/modules/pms/controller/QcController.java

@@ -1649,6 +1649,19 @@ public class QcController {
         List<QcFAIRecordData> list = qcService.rollNoEnter(data);
         return R.ok().put("rows", list);
     }
+
+    /**
+     * @description: 查询物料集合
+     * @author: fengyuan_yang
+     * @date: 2023/11/7 14:48
+     * @param: [data]
+     * @return: com.xujie.sys.common.utils.R
+     **/
+    @PostMapping("/queryPartList")
+    public R queryPartList(@RequestBody QcFAIRecordData data){
+        List<QcFAIRecordData> list = qcService.queryPartList(data);
+        return R.ok().put("rows", list);
+    }
 }
 
 

src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java

@@ -73,6 +73,8 @@ public class QcFAIRecordData extends QueryPage {
     private Date inspectorDate;
     // 质检员工号
     private String inspectorNo;
+    // 检验员姓名
+    private String inspectorName;
     // 模板编码
     private String templateId;
     // 属性编码
@@ -162,6 +164,14 @@ public class QcFAIRecordData extends QueryPage {
     // 加工中心
     private String workCenterNo;
 
+    public String getInspectorName() {
+        return inspectorName;
+    }
+
+    public void setInspectorName(String inspectorName) {
+        this.inspectorName = inspectorName;
+    }
+
     public String getWorkCenterNo() {
         return workCenterNo;
     }

src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java

@@ -427,4 +427,6 @@ public interface QcMapper {
     List<QcFAIRecordData> getRollNo(QcFAIRecordData data);
 
     QcFAIRecordData rollNoEnter(QcFAIRecordData data);
+
+    List<QcFAIRecordData> queryPartList(QcFAIRecordData data);
 }

src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java

@@ -3216,6 +3216,19 @@ public class QcServiceImpl implements QcService {
         return list;
     }
 
+    /**
+     * @description: 查询物料集合
+     * @author: fengyuan_yang
+     * @date: 2023/11/7 14:48
+     * @param: [data]
+     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
+     **/
+    @Override
+    public List<QcFAIRecordData> queryPartList(QcFAIRecordData data) {
+        List<QcFAIRecordData> list = qcMapper.queryPartList(data);
+        return list;
+    }
+
 
 }
 

src/main/java/com/xujie/sys/modules/pms/service/QcService.java

@@ -255,4 +255,6 @@ public interface QcService {
     List<QcFAIRecordData> getRollNo(QcFAIRecordData data);
 
     List<QcFAIRecordData> rollNoEnter(QcFAIRecordData data);
+
+    List<QcFAIRecordData> queryPartList(QcFAIRecordData data);
 }

src/main/resources/mapper/pms/QcMapper.xml

@@ -1457,6 +1457,7 @@
         disposal_remark,
         inspector_date,
         inspector_no,
+        dbo.qc_get_inspector_name(site, inspector_no) as inspectorName,
         ssr_id,
         unqualified_qty,
         submit_flag,
@@ -1715,7 +1716,6 @@
         inspection_result,
         task_date,
         inspection_type_no,
-        dbo.qc_get_inspection_type_name(site, inspection_type_no) as inspectionTypeName,
         inspection_cycle,
         order_no,
         operation_desc,
@@ -1730,6 +1730,7 @@
         disposal_remark,
         inspector_date,
         inspector_no,
+        dbo.qc_get_inspector_name(site, inspector_no) as inspectorName,
         ssr_id,
         unqualified_qty,
         submit_flag,
@@ -1933,10 +1934,9 @@
             DBO.getResourceDesc(a.site, a.s_resourceid) as resourceDesc,
             c.work_center_no
         FROM soscheduledrouting as a
-        LEFT JOIN sfdc as b ON a.site = b.site and a.seqno = b.assjob_seq_no
-        LEFT JOIN so_routing as c ON c.order_no = a.orderno and a.itemno = c.item_no and c.site = a.site
-        LEFT JOIN part j ON a.site = j.site and a.part_no = j.part_no
-        WHERE b.approve_qty is not null and a.seqno = #{seqNo}
+        LEFT JOIN so_routing as c ON c.order_no = a.orderno and a.itemno = c.item_no
+        LEFT JOIN part j ON a.part_no = j.part_no
+        WHERE a.seqno = #{seqNo}
     </select>
 
     <!-- 根据工单号和工序号查出所有数据 -->
@@ -2307,6 +2307,7 @@
         disposal_remark,
         inspector_date,
         inspector_no,
+        dbo.qc_get_inspector_name(site, inspector_no) as inspectorName,
         ssr_id,
         unqualified_qty,
         submit_flag,
@@ -2665,6 +2666,28 @@
         WHERE b.roll_no = #{rollNo}
     </select>
 
+    <!-- 查询物料列表 -->
+    <select id="queryPartList" resultType="QcFAIRecordData" parameterType="QcFAIRecordData">
+        SELECT
+        site,
+        part_no,
+        part_desc,
+        sku,
+        spec
+        FROM part
+        <where>
+            site = #{site}
+            <if test = "partNo != null and partNo != ''">
+                AND part_no LIKE '%' + #{partNo} + '%'
+            </if>
+            <if test = "partDesc != null and partDesc != ''">
+                AND part_desc LIKE '%' + #{partDesc} + '%'
+            </if>
+            <if test = "sku != null and sku != ''">
+                AND sku LIKE '%' + #{sku} + '%'
+            </if>
+        </where>
+    </select>
 </mapper>