2023-11-08，设备和质量修改

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

@@ -379,9 +379,9 @@ public class QcController {
      * @param: []
      * @return: com.xujie.sys.common.utils.R
      **/
-    @PostMapping(value="/InspectionTypeSearch")
-    public R InspectionTypeSearch(@RequestBody QcInspectionTypeData data){
-        List<QcInspectionTypeData> list = qcService.InspectionTypeSearch(data);
+    @PostMapping(value="/inspectionTypeSearch")
+    public R inspectionTypeSearch(@RequestBody QcInspectionTypeData data){
+        List<QcInspectionTypeData> list = qcService.inspectionTypeSearch(data);
         return R.ok().put("rows", list);
     }
 
@@ -1662,6 +1662,19 @@ public class QcController {
         List<QcFAIRecordData> list = qcService.queryPartList(data);
         return R.ok().put("rows", list);
     }
+
+    /**
+     * @description: 查询单位列表
+     * @author: fengyuan_yang
+     * @date: 2023/11/8 9:27
+     * @param: [data]
+     * @return: com.xujie.sys.common.utils.R
+     **/
+    @PostMapping(value="/umSearch")
+    public R umSearch(@RequestBody QcFAIRecordData data){
+        List<QcFAIRecordData> list = qcService.umSearch(data);
+        return R.ok().put("rows", list);
+    }
 }
 
 

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

@@ -163,6 +163,36 @@ public class QcFAIRecordData extends QueryPage {
     private Integer subDetailRecordNum;
     // 加工中心
     private String workCenterNo;
+    // 单位编码
+    private String umId;
+    // 单位名称
+    private String umName;
+    // 是否可用
+    private String active;
+
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public String getUmId() {
+        return umId;
+    }
+
+    public void setUmId(String umId) {
+        this.umId = umId;
+    }
+
+    public String getUmName() {
+        return umName;
+    }
+
+    public void setUmName(String umName) {
+        this.umName = umName;
+    }
 
     public String getInspectorName() {
         return inspectorName;

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

@@ -161,7 +161,7 @@ public interface QcMapper {
 
     String queryLastSamplingPlanNo(QcSamplingInspectionPlanData data);
 
-    List<QcInspectionTypeData> InspectionTypeSearch(QcInspectionTypeData data);
+    List<QcInspectionTypeData> inspectionTypeSearch(QcInspectionTypeData data);
 
     IPage<QcPartAttributeData> qcPartAttributeSearch(Page<QcPartAttributeData> qcPartAttributeDataPage,@Param("query") QcPartAttributeData data);
 
@@ -429,4 +429,6 @@ public interface QcMapper {
     QcFAIRecordData rollNoEnter(QcFAIRecordData data);
 
     List<QcFAIRecordData> queryPartList(QcFAIRecordData data);
+
+    List<QcFAIRecordData> umSearch(QcFAIRecordData data);
 }

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

@@ -939,8 +939,8 @@ public class QcServiceImpl implements QcService {
      * @return: java.util.List<com.xujie.sys.modules.pms.data.QcInspectionTypeData>
      **/
     @Override
-    public List<QcInspectionTypeData> InspectionTypeSearch(QcInspectionTypeData data) {
-        List<QcInspectionTypeData> list = qcMapper.InspectionTypeSearch(data);
+    public List<QcInspectionTypeData> inspectionTypeSearch(QcInspectionTypeData data) {
+        List<QcInspectionTypeData> list = qcMapper.inspectionTypeSearch(data);
         return list;
     }
 
@@ -3229,6 +3229,19 @@ public class QcServiceImpl implements QcService {
         return list;
     }
 
+    /**
+     * @description: 查询单位列表
+     * @author: fengyuan_yang
+     * @date: 2023/11/8 9:28
+     * @param: [data]
+     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
+     **/
+    @Override
+    public List<QcFAIRecordData> umSearch(QcFAIRecordData data) {
+        List<QcFAIRecordData> list = qcMapper.umSearch(data);
+        return list;
+    }
+
 
 }
 

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

@@ -104,7 +104,7 @@ public interface QcService {
 
     void samplingLevelDelete(QcSamplingInspectionLevelData data);
 
-    List<QcInspectionTypeData> InspectionTypeSearch(QcInspectionTypeData data);
+    List<QcInspectionTypeData> inspectionTypeSearch(QcInspectionTypeData data);
 
     PageUtils qcPartAttributeSearch(QcPartAttributeData data);
 
@@ -257,4 +257,6 @@ public interface QcService {
     List<QcFAIRecordData> rollNoEnter(QcFAIRecordData data);
 
     List<QcFAIRecordData> queryPartList(QcFAIRecordData data);
+
+    List<QcFAIRecordData> umSearch(QcFAIRecordData data);
 }

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

@@ -502,10 +502,10 @@
     </delete>
 
     <!-- 搜索所有检验类型 -->
-    <select id="InspectionTypeSearch" resultType="QcInspectionTypeData" parameterType="QcInspectionTypeData">
+    <select id="inspectionTypeSearch" resultType="QcInspectionTypeData" parameterType="QcInspectionTypeData">
         SELECT inspection_type_no,
                inspection_type_name
-        FROM  qc_inspection_type
+        FROM qc_inspection_type
         WHERE site = #{site}
     </select>
 
@@ -1423,8 +1423,8 @@
 
     <!-- 新增FAI主记录信息 -->
     <insert id="saveFAIRecord" parameterType="QcFAIRecordData">
-        INSERT INTO qc_fai_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no)
-        VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo})
+        INSERT INTO qc_fai_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no, um_id)
+        VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}, #{umId})
     </insert>
 
     <!-- 新增FAI明细记录信息 -->
@@ -1468,7 +1468,9 @@
         batch_roll_no,
         special_requirements,
         work_center_no,
-        roll_no
+        roll_no,
+        um_id,
+        dbo.qc_get_um_name(site, um_id) as umName
         FROM qc_fai_record
         <where>
             site = #{query.site}
@@ -1703,8 +1705,8 @@
 
     <!-- 新增IPQC主记录信息 -->
     <insert id="saveIPQCRecord" parameterType="QcFAIRecordData">
-        INSERT INTO qc_ipqc_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no)
-        VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo})
+        INSERT INTO qc_ipqc_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no, um_id)
+        VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}, #{umId})
     </insert>
 
     <!-- 查询IPQC主记录信息 -->
@@ -1741,7 +1743,9 @@
         batch_roll_no,
         special_requirements,
         work_center_no,
-        roll_no
+        roll_no,
+        um_id,
+        dbo.qc_get_um_name(site, um_id) as umName
         FROM qc_ipqc_record
         <where>
             site = #{query.site}
@@ -1752,7 +1756,7 @@
                 AND part_no LIKE '%' + #{query.partNo} + '%'
             </if>
             <if test = "query.state != null and query.state != ''">
-                AND `state` = #{query.state}
+                AND state = #{query.state}
             </if>
             <if test = "query.inspectionTypeNo != null and query.inspectionTypeNo != ''">
                 AND inspection_type_no = #{query.inspectionTypeNo}
@@ -2318,7 +2322,9 @@
         batch_roll_no,
         special_requirements,
         work_center_no,
-        roll_no
+        roll_no,
+        um_id,
+        dbo.qc_get_um_name(site, um_id) as umName
         FROM qc_fqc_record
         <where>
             site = #{query.site}
@@ -2359,8 +2365,8 @@
 
     <!-- 新增FQC主记录信息 -->
     <insert id="saveFQCRecord" parameterType="QcFAIRecordData">
-        INSERT INTO qc_fqc_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no)
-        VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo})
+        INSERT INTO qc_fqc_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no, um_id)
+        VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}, #{umId})
     </insert>
 
     <!-- FQC明细记录查询 -->
@@ -2688,6 +2694,16 @@
             </if>
         </where>
     </select>
+
+    <!-- 查询单位列表 -->
+    <select id="umSearch" resultType="QcFAIRecordData" parameterType="QcFAIRecordData">
+        SELECT
+            site,
+            UMID as umId,
+            UMName as umName
+        FROM UM
+        WHERE site = #{site} and active = #{active}
+    </select>
 </mapper>