耳机巡检报告bug修复

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

@@ -313,7 +313,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
     public List<QcStaticTable> getXJCheckTableDetail(QcStaticTable qcStaticTable) {
 
         String groupId = qcStaticTableMapper.getGroupIdByOrderNo(qcStaticTable.getOrderNo());
-        if(StringUtils.isBlank(groupId) || groupId.indexOf("-")<0){
+        if(StringUtils.isBlank(groupId)){
             groupId = "3dc0655fea3449c59c76a01cc5b91565";
         }
         qcStaticTable.setGroupId(groupId);

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

@@ -1400,9 +1400,10 @@
              ) t group by t.ymdms
     </select>
     <select id="getGroupIdByOrderNo" resultType="java.lang.String">
-        select bp.mvgr5
+        select qmg.id
         from pro_order_workorder pow
                  left join base_product bp on bp.product_code = pow.product_code
+                 left join qc_material_group qmg on qmg.group_code = bp.mvgr5
         where pow.workorder_code = #{orderNo}
     </select>