检验方案、检测项配置增加两项+报工汇率加到成品上

op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java

@@ -382,8 +382,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
             if(sHzWorks==null){
                 return R.fail("未查询到子报工单");
             }
-            //查询base_product的report_rate//箱子-大盒-小盒
-            BigDecimal reportRate = mesReportWorkMapper.getReportRate(workOrders.get(0).getProductCode());
+
             //子工单报工
             logger.info("==========================子工单报工开始");
             sHzWorks.setMachineCode(mesReportWork.getMachineCode());
@@ -404,6 +403,8 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
                 }
                 //母工单报工
                 logger.info("==========================母工单报工开始");
+                //查询base_product的report_rate//箱子-大盒-小盒
+                BigDecimal reportRate = mesReportWorkMapper.getReportRate(workOrders.get(1).getProductCode());
                 if(reportRate != null){
                     BigDecimal newQuantity = sHzWorks.getQuantityFeedback().divide(reportRate,2, RoundingMode.HALF_UP);
                     pHzWork.setQuantityFeedback(newQuantity);

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

@@ -138,6 +138,33 @@ public class QcCheckTaskDetail extends BaseEntity {
     private String defectCodes;
     private String defectNames;
     private String defectQualitys;
+    private String itemType;
+    private String judgeRate;
+    private String samplePlan;
+
+    public String getSamplePlan() {
+        return samplePlan;
+    }
+
+    public void setSamplePlan(String samplePlan) {
+        this.samplePlan = samplePlan;
+    }
+
+    public String getItemType() {
+        return itemType;
+    }
+
+    public void setItemType(String itemType) {
+        this.itemType = itemType;
+    }
+
+    public String getJudgeRate() {
+        return judgeRate;
+    }
+
+    public void setJudgeRate(String judgeRate) {
+        this.judgeRate = judgeRate;
+    }
 
     public String getDefectCodes() {
         return defectCodes;

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

@@ -153,7 +153,9 @@
 			   qctp.upper_diff upperDiff,
 			   qctp.down_diff downDiff,
 			   qctp.sample,
-			   qctp.sample_num sampleNum,
+			   qcp.sample_plan samplePlan,
+               qctp.item_type itemType,
+               qctp.judge_rate judgeRate,
 			   qpt.standard_no standardNo
 		from qc_check_task_detail td
 		left join qc_check_type_project qctp on td.type_project_id = qctp.id