Merge remote-tracking branch 'origin/master'

op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java

@@ -252,6 +252,13 @@ public class QuaController extends BaseController {
         return qcCheckTaskIncomeService.getDefectListPDA(qcDefectType);
     }
 
+    /**检测地点编码名称**/
+    @PostMapping("/getCheckLocList")
+    public List<QcDefectType> getCheckLocList(@RequestBody QcDefectType qcDefectType) {
+        DynamicDataSourceContextHolder.push(qcDefectType.getFactoryCode());
+        return qcCheckTaskIncomeService.getCheckLocList(qcDefectType);
+    }
+
     /**获取生产工单列表**/
     @GetMapping("/getWorkOrder")
     public TableDataInfo getWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) {

op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java

@@ -108,4 +108,6 @@ public interface QcCheckTaskIncomeMapper {
     List<QcCheckTaskIncome> getIncomeBatchList();
 
     int updateIncomeBatchList(@Param("list") List<String> batchRecordIds, @Param("time") Date taskTime);
+
+    List<QcDefectType> getCheckLocList(QcDefectType qcDefectType);
 }

op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java

@@ -96,4 +96,6 @@ public interface IQcCheckTaskIncomeService {
     List<QcCheckTaskIncome> getIncomeBatchList(String poolName);
 
     int updateIncomeBatchList(List<String> batchRecordIds , Date taskTime);
+
+    List<QcDefectType> getCheckLocList(QcDefectType qcDefectType);
 }

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java

@@ -721,4 +721,11 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 	public int updateIncomeBatchList(List<String> batchRecordIds , Date taskTime){
 		return qcCheckTaskIncomeMapper.updateIncomeBatchList(batchRecordIds ,taskTime);
 	}
+
+	@Override
+	public List<QcDefectType> getCheckLocList(QcDefectType qcDefectType) {
+		return qcCheckTaskIncomeMapper.getCheckLocList(qcDefectType);
+	}
+
+
 }

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml

@@ -160,6 +160,7 @@
 		left join qc_check_project qcp on qcp.id = qctp.project_id
 		left join qc_project_type qpt on qpt.project_type_code = qcp.project_type
         where td.belong_to = #{recordId}
+        order by qctp.sort
 	</select>
     <select id="getTopInfo" resultType="com.op.quality.domain.QcCheckTaskProduce">
 		select t.*,be.equipment_name lineName from(

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml

@@ -151,6 +151,7 @@
 		from qc_check_task_detail td
 		left join qc_check_type_project qctp on td.type_project_id = qctp.id
         where td.belong_to = #{belongTo} and td.del_flag='0' and qctp.del_flag = '0' and td.rule_name is not null
+        order by qctp.sort
 	</select>
     <select id="getQcUnitList" resultType="com.op.system.api.domain.SysDictData">
 		select dict_label dictLabel,
@@ -440,6 +441,13 @@
 		and check_status = '0'
 	</select>
 
+    <select id="getCheckLocList" resultType="com.op.quality.domain.QcDefectType">
+        select equipment_code defectCode,
+               equipment_name defectSubclass
+        from base_equipment
+        where equipment_type_code='equ_type_bzx' and status = '1'
+    </select>
+
     <!--批量更新原始表-->
     <update id="updateIncomeBatchList">
         <foreach collection="list" item="item" separator=";">
@@ -451,4 +459,6 @@
             record_id = #{item}
         </foreach>
     </update>
+
+
 </mapper>

op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml

@@ -203,22 +203,21 @@
 		  and CONVERT(varchar(7),feedback_time, 120) = SUBSTRING(#{ymd},0,8)
 	</select>
     <select id="getDayNoOkHz" resultType="com.op.quality.domain.QcInterface">
-		SELECT
-			concat(t.machine_code,t.ymd) ymd,
-			sum(t.noOk_quality) noOkQuality,
-			t.machine_code machineCode
-		from(
-				select CONVERT(varchar(10),qct.income_time, 120) ymd,
-					   qct.noOk_quality,
-					   mrw.machine_code
-				from qc_check_task qct
-						 left join pro_order_workorder pow on qct.order_no = pow.workorder_code_sap
-						 left join mes_report_work mrw on pow.workorder_code = mrw.workorder_code
-				where qct.type_code = #{typeCode}
-				  and qct.del_flag='0'
-				  and CONVERT(varchar(7),qct.income_time, 120) = SUBSTRING(#{ymd},0,8)
-			) t
-		group by t.machine_code,t.ymd
+        SELECT
+            concat(t.workorder_name,t.ymd) ymd,
+            sum(t.noOk_quality) noOkQuality,
+            t.workorder_name machineCode
+        from(
+                select CONVERT(varchar(10),qct.income_time, 120) ymd,
+                       qct.noOk_quality,
+                       pow.workorder_name
+                from qc_check_task qct
+                         left join pro_order_workorder pow on qct.order_no = pow.workorder_code
+                where qct.type_code = #{typeCode}
+                  and qct.del_flag='0'
+                  and CONVERT(varchar(7),qct.income_time, 120) = SUBSTRING(#{ymd},0,8)
+            ) t
+        group by t.workorder_name,t.ymd
 	</select>
     <select id="getMothNoOkNum" resultType="com.op.quality.domain.QcInterface">
 		select

op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml

@@ -269,6 +269,7 @@
             <if test='checkType=="checkTypeSCXJ" or checkType=="checkTypeSC"'>
                 and pow.del_flag = '0'
             </if>
+            <if test="checkLoc != null  and checkLoc != ''">and qct.check_loc = #{checkLoc}</if>
             <if test="checkType != null  and checkType != ''">and qct.check_type = #{checkType}</if>
             <if test="checkManCode != null  and checkManCode != ''">and qctu.check_man_code = #{checkManCode}</if>
             <if test="checkStatus != null  and checkStatus != ''">and qct.check_status in (${checkStatus})</if>