change - 二线质检存入过点数据

aucma-report/src/main/java/com/aucma/report/service/impl/MaterialCompletionServiceImpl.java

@@ -101,7 +101,7 @@ public class MaterialCompletionServiceImpl implements IMaterialCompletionService
         MaterialCompletion materialCompletion = new MaterialCompletion();
         //质检转过点数据
         if (StringUtils.isNotEmpty(inspection.getBarCode())) {
-            ReportQualityInspection qualityInspection = qualityInspectionService.selectReportQualityInspectionByBarcode(inspection.getBarCode());
+            ReportQualityInspection qualityInspection = qualityInspectionService.selectReportQualityInspectionByBarcode(inspection.getBarCode(), "CX_02");
             if (StringUtils.isNotEmpty(qualityInspection.getOrderCode())){
                 materialCompletion.setOrderCode(qualityInspection.getOrderCode());
             }

aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml

@@ -224,7 +224,7 @@
         SELECT BF.FACTORY_NAME,
         PL2.PRODUCT_LINE_CODE,
         PL2.PRODUCT_LINE_NAME,
-        GET_MATERIAL_TYPE(RQI.MATERIAL_NAME) MATERIAL_MODEL,
+        SUBSTR(BO.MATERIAL_NAME, 1, INSTR(BO.MATERIAL_NAME, ',') - 1) MATERIAL_MODEL,
         RQI.BAR_CODE,
         RQI.QUALITY_DEFECT_CODE,
         QI.QUALITY_DEFECT_NAME
@@ -233,6 +233,8 @@
         LEFT JOIN BASE_PRODUCTLINE PL2 on PL2.PRODUCT_LINE_CODE = PL.PARENT_ID
         LEFT JOIN BASE_FACTORY BF on BF.FACTORY_CODE = PL.PLANT_CODE
         LEFT JOIN BASE_QUALITY_INSPECTION_ITEM QI on QI.QUALITY_DEFECT_CODE = RQI.QUALITY_DEFECT_CODE
+        LEFT JOIN C##AUCMA_SCADA.PRINT_BARCODE PB ON PB.MATERIAL_BARCODE = RQI.BAR_CODE
+        LEFT JOIN BASE_ORDERINFO BO ON BO.ORDER_CODE = PB.ORDER_CODE
         WHERE RQI.TREATMENT_MEASURE = '1'
         <if test="beginBeginTime != null  and beginBeginTime != '' and endBeginTime != null  and endBeginTime != ''">
             AND TO_CHAR(RQI.INSPECTOR_TIME, 'YYYY-MM-DD HH24:MI:SS') BETWEEN #{beginBeginTime} AND #{endBeginTime}
@@ -244,7 +246,7 @@
             AND RQI.MATERIAL_NAME LIKE '%' || #{MATERIAL_MODEL} || '%'
         </if>
         GROUP BY BF.FACTORY_NAME, PL2.PRODUCT_LINE_CODE, PL2.PRODUCT_LINE_NAME,
-        GET_MATERIAL_TYPE(RQI.MATERIAL_NAME),
+        SUBSTR(BO.MATERIAL_NAME, 1, INSTR(BO.MATERIAL_NAME, ',') - 1),
         RQI.BAR_CODE, RQI.QUALITY_DEFECT_CODE, QI.QUALITY_DEFECT_NAME
         ) ZSD
         CROSS JOIN (SELECT COUNT(*) OFFLINE_NUM

aucma-report/src/main/resources/mapper/report/RecordExceptionProcessMapper.xml

@@ -37,8 +37,8 @@
     <sql id="selectRecordExceptionProcessVo">
         select rep.obj_id,
                PB.ORDER_CODE              orderCode,
-               BP.PRODUCT_LINE_CODE       productLineCode,
-               BP.PRODUCT_LINE_NAME       productLineName,
+               NVL(BP.PRODUCT_LINE_CODE, 'CX_01') productLineCode,
+               NVL(BP.PRODUCT_LINE_NAME, '一线')    productLineName,
                rep.box_barcode,
                ML.MATERIAL_SPECIFICATIONS materialModel,
                rep.production_user_flag,
@@ -64,9 +64,8 @@
                rep.updated_time
         from record_exception_process rep
                  left join C##AUCMA_SCADA.PRINT_BARCODE PB ON PB.MATERIAL_BARCODE = rep.BOX_BARCODE
-                 left join BASE_ORDERINFO bo on bo.ORDER_CODE = pb.ORDER_CODE
-                 left join BASE_PRODUCTLINE BP ON BP.WORK_CENTER_CODE = BO.WORK_CENTER_CODE
-                 LEFT JOIN BASE_MATERIALINFO ML ON ML.MATERIAL_CODE = PB.MATERIAL_CODE
+                 left join BASE_PRODUCTLINE BP ON BP.PRODUCT_LINE_CODE = PB.PRODUCT_LINE_CODE
+                 left JOIN BASE_MATERIALINFO ML ON ML.MATERIAL_CODE = PB.MATERIAL_CODE
                  left join BASE_TEAMMEMBERS bt on bt.TEAM_CODE = rep.TEAM_CODE
     </sql>