成品抽样算法增加

op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java

@@ -217,6 +217,7 @@ public class QcCheckTaskIncome extends BaseEntity {
     private String oaFactoryF;//异常范围
     private String sccj;
     private String bz;
+    private int umrez;
     /**
      * 	cxzz:产线组长签名路径，(首检)
      * 	jgy:机管员签名路径，(首检)
@@ -226,6 +227,15 @@ public class QcCheckTaskIncome extends BaseEntity {
     private String jgy;
     private String pgy;
 
+
+    public int getUmrez() {
+        return umrez;
+    }
+
+    public void setUmrez(int umrez) {
+        this.umrez = umrez;
+    }
+
     public String getCxzz() {
         return cxzz;
     }

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

@@ -210,6 +210,10 @@ public class QcProCheckServiceImpl implements QcProCheckService {
                             String letter = GB2828Sampler.getSampleSizeLetter(qcd.getQuality().setScale(0, RoundingMode.HALF_UP).intValue(), qcd.getSamplingPlan());
                             int sampleSize = GB2828Sampler.getSampleSize(letter);
                             qcd.setSampleQuality(String.valueOf(sampleSize));
+                            char eighthChar = dto.getMaterialCode().charAt(7);
+                            if(eighthChar == '1' &&StringUtils.isNotEmpty(String.valueOf(dto.getUmrez()))){
+                                qcd.setSampleQuality(String.valueOf(sampleSize*dto.getUmrez()));
+                            }
                         }
                     }
                 }
@@ -268,6 +272,10 @@ public class QcProCheckServiceImpl implements QcProCheckService {
                             String letter = GB2828Sampler.getSampleSizeLetter(qcd.getQuality().setScale(0, RoundingMode.HALF_UP).intValue(), qcd.getSamplingPlan());
                             int sampleSize = GB2828Sampler.getSampleSize(letter);
                             qcd.setSampleQuality(String.valueOf(sampleSize));
+                            char eighthChar = dto.getMaterialCode().charAt(7);
+                            if(eighthChar == '1' &&StringUtils.isNotEmpty(String.valueOf(dto.getUmrez()))){
+                                qcd.setSampleQuality(String.valueOf(sampleSize*dto.getUmrez()));
+                            }
                         }
                     }
                 }

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

@@ -158,7 +158,7 @@
 		       td.sample_code sampleCode,
 		       qct.quality quality,
 		       td.sample_quality sampleQuality,
---                qctp.sample_num sampleQuality,
+               qctp.sample_num   sampleNum,
                td.sample_aql sampleAql,
                td.check_level checkLevel,
 			   qctp.upper_diff upperDiff,
@@ -696,9 +696,10 @@
             qct.pgzg,
             qct.pgzr,
             qct.sfgyswt,
-            qct.sccj,qct.cxzz,qct.jgy, qct.pgy
+            qct.sccj,qct.cxzz,qct.jgy, qct.pgy,bp.umrez
         from qc_check_task_cg qct
                  left join pro_order_workorder pow on pow.workorder_code = qct.order_no and pow.del_flag = '0'
+                 LEFT JOIN base_product bp ON qct.material_code = bp.product_code AND bp.del_flag = '0'
         where qct.record_id = #{recordId}
     </select>