首检bug修复

op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml

@@ -685,7 +685,8 @@
                pow.product_date productDateStr,
                pow.workorder_code_sap workorderCode,
                powb.batch_code batchCode,
-               powb.batch_quantity batchQuantity,
+               case when powbp.quantity is not null then powbp.quantity
+               else powb.batch_quantity end batchQuantity,
                bpa.pallet_num palletNum,
                concat(pow.workorder_code_sap,'-', powb.batch_code) palletCode,
                powbp.pallet_num palletNo

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

@@ -214,18 +214,15 @@ public class QuaController extends BaseController {
     @PostMapping(value = "commitCheckResults")
     public AjaxResult commitCheckResults(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) {
         DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode());
-        if(CollectionUtils.isEmpty(qcCheckTaskIncome.getQcCheckTaskDetails())){
+//        if(CollectionUtils.isEmpty(qcCheckTaskIncome.getQcCheckTaskDetails())){
-            return error("[List<QcCheckTaskDetail>]不能为空");
+//            return error("[List<QcCheckTaskDetail>]不能为空");
-        }
+//        }
         if(StringUtils.isBlank(qcCheckTaskIncome.getUpdateBy())){
             return error("[updateBy]不能为空");
         }
         if(StringUtils.isBlank(qcCheckTaskIncome.getUpdateByName())){
             return error("[updateByName]不能为空");
         }
-//        if(StringUtils.isBlank(qcCheckTaskIncome.getCheckResult())){
-//            return error("[checkResult]不能为空");
-//        }
         return toAjax(qcCheckTaskIncomeService.commitCheckResults(qcCheckTaskIncome));
     }
 

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

@@ -187,6 +187,15 @@ public class QcCheckReportIncome extends BaseEntity {
     private Boolean myself;
     private String shiftId;
     private String orderType;
+    private String standardNo;
+
+    public String getStandardNo() {
+        return standardNo;
+    }
+
+    public void setStandardNo(String standardNo) {
+        this.standardNo = standardNo;
+    }
 
     public String getOrderType() {
         return orderType;

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

@@ -82,7 +82,7 @@ public interface QcCheckReportIncomeMapper {
 
     QcCheckReportIncome getLastXJTaskInfo(QcCheckReportIncome qcCheckReportIncome);
 
-    QcCheckTaskProduce getLastProductTypeInfo(QcCheckTaskProduce qcCheckTaskProduce);
+    List<QcCheckTaskProduce> getLastProductTypeInfo(QcCheckTaskProduce qcCheckTaskProduce);
 
     List<String> getBatchsByTaskId(String recordId);
 }

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

@@ -208,6 +208,10 @@ public class QcCheckReportIncomeServiceImpl implements IQcCheckReportIncomeServi
                 dto.setActualValue(dto.getRemark());
             }
 
+            if(StringUtils.isNotBlank(dto.getActualValue()) && dto.getActualValue().equals("[\"/\"]")){
+                dto.setStatus("未检验");
+            }
+
             //检验项目
             String ruleName = dto.getRuleName();
             if(StringUtils.isNotBlank(ruleName)){

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

@@ -221,13 +221,26 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer
         qcStaticTable.setShiftId(qcCheckTaskProduce.getShiftId());
         List<QcStaticTable> checkInfos = qcStaticTableService.getXJCheckTableDetail(qcStaticTable);
         produce.setCheckInfos(checkInfos);
-        QcCheckTaskProduce lastProduce = qcCheckReportIncomeMapper.getLastProductTypeInfo(qcCheckTaskProduce);
+        List<QcCheckTaskProduce> lastProduces = qcCheckReportIncomeMapper.getLastProductTypeInfo(qcCheckTaskProduce);
-        if (lastProduce != null) {
+        if (!CollectionUtils.isEmpty(lastProduces)) {
-            produce.setProductType(lastProduce.getProductType());
+            produce.setProductType(lastProduces.get(0).getProductType());
-            produce.setCheckManCode(lastProduce.getCheckManCode());
+            String mancodes = lastProduces.stream()
-            produce.setCheckManName(lastProduce.getCheckManName());
+                    .map(QcCheckTaskProduce::getCheckManCode)
-            produce.setConfirmManCode(lastProduce.getConfirmManCode());
+                    .collect(Collectors.joining(", "));
-            produce.setConfirmManName(lastProduce.getConfirmManName());
+            produce.setCheckManCode(mancodes);
+            String mannames = lastProduces.stream()
+                    .map(QcCheckTaskProduce::getCheckManName)
+                    .collect(Collectors.joining(", "));
+            produce.setCheckManName(mannames);
+            String cmancodes = lastProduces.stream()
+                    .map(QcCheckTaskProduce::getConfirmManCode)
+                    .collect(Collectors.joining(", "));
+            produce.setConfirmManCode(cmancodes);
+            String cmannames = lastProduces.stream()
+                    .map(QcCheckTaskProduce::getConfirmManName)
+                    .filter(confirmManName -> confirmManName != null)
+                    .collect(Collectors.joining(", "));
+            produce.setConfirmManName(cmannames);
         }
         return produce;
     }

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

@@ -689,6 +689,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		qcCheckTask.setCheckManName(qcCheckTaskIncome.getUpdateByName());
 		qcCheckTask.setSampleQuality(qcCheckTaskIncome.getSampleQuality());
 		qcCheckTask.setReason(qcCheckTaskIncome.getReason());
+		qcCheckTask.setAttr3(qcCheckTaskIncome.getAttr3());
 		/**qc_check_task**/
 		n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask);
 		logger.info("qc_check_task:"+n);

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

@@ -39,6 +39,8 @@
         <result property="reason" column="reason"/>
         <result property="productType" column="product_type"/>
         <result property="orderType" column="order_type"/>
+        <result property="standardNo" column="standardNo"/>
+
     </resultMap>
 
     <sql id="selectQcCheckReportIncomeVo">
@@ -90,8 +92,16 @@
     </select>
 
     <select id="selectQcCheckReportIncomeByRecordId" parameterType="String" resultMap="QcCheckReportIncomeResult">
-        <include refid="selectQcCheckReportIncomeVo"/>
+        select qct.record_id, qct.check_no, qct.income_batch_no, qct.order_no, qct.material_code, qct.material_name,
-        where record_id = #{recordId}
+               qct.quality, qct.unit,qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc,
+               qct.check_status, qct.check_man_code, qct.check_man_name,
+               qct.check_time, qct.check_result, qct.status, qct.check_type, qct.attr1, qct.attr2, qct.attr3, qct.attr4,
+               qct.create_by, qct.create_time, qct.update_by, qct.update_time,
+               qct.factory_code, qct.del_flag,qct.reason,qct.product_type,qct.order_type,
+               bp.mvgr5 standardNo
+        from qc_check_task qct
+        left join base_product bp on bp.product_code = qct.material_code
+        where qct.record_id = #{recordId}
     </select>
 
     <select id="getQcListBom" resultType="com.op.quality.domain.QcBomComponent">
@@ -154,7 +164,7 @@
 			   qctp.upper_diff upperDiff,
 			   qctp.down_diff downDiff,
 			   qctp.sample,
-			   qcp.sample_plan samplePlan,
+               td.sample_quality samplePlan,
                qctp.item_type itemType,
                qctp.judge_rate judgeRate,
 			   qpt.standard_no standardNo,
@@ -234,17 +244,16 @@
 		order by c.create_time desc
 	</select>
     <select id="getLastProductTypeInfo" resultType="com.op.quality.domain.QcCheckTaskProduce">
-		SELECT
+        SELECT
-			top 1
+            distinct
-			c.product_type productType,
+            c.product_type productType,
-			c.check_man_code checkManCode,
+            c.check_man_code checkManCode,
-			c.check_man_name checkManName,
+            c.check_man_name checkManName,
-			c.confirm_man_code confirmManCode,
+            c.confirm_man_code confirmManCode,
-			c.confirm_man_name confirmManName
+            c.confirm_man_name confirmManName
-		FROM
+        FROM
-			qc_check_task c
+            qc_check_task c
-		where c.check_type='checkTypeSCXJ' and c.order_no = #{orderNo}
+        where c.check_type='checkTypeSCXJ' and c.order_no = #{orderNo}
-		order by c.create_time desc
 	</select>
     <select id="getBatchsByTaskId" resultType="java.lang.String">
         select powb.batch_code incomeBatchNo

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

@@ -314,6 +314,7 @@
         <if test="incomeBatchNo != null">income_batch_no = #{incomeBatchNo},</if>
         <if test="remark != null">remark = #{remark},</if>
         <if test="reason != null">reason = #{reason},</if>
+        <if test="attr3 != null">attr3 = #{attr3},</if>
         check_result = #{checkResult},
         update_by = #{updateBy},
         update_time = #{updateTime}