问题修复24

op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java

@@ -109,7 +109,7 @@ public class MesReportWorkController extends BaseController {
 //			String dateEndStr = dtf.format(dateEnd)+" 00:00:00";
 //			mesReportWork.setCreateTimeEnd(dateEndStr);//end
 //		}
-		List<MesReportWork> list = mesReportWorkService.selectMesReportWorkList_S(mesReportWork);
+		List<MesReportWork> list = mesReportWorkService.getReportWorkHzList(mesReportWork);
 		for(MesReportWork dto:list){
 			if("1".equals(dto.getUploadStatus())){
 				dto.setUploadStatus("sap报工成功");

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

@@ -730,7 +730,6 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
         // 定义一个日期格式化器
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         // 打印最近七天的日期
-        System.out.println("最近七天的日期:");
         for (int i = 0; i < 7; i++) {
             LocalDate date = today.minusDays(i);
             days.add(date.format(formatter));
@@ -1232,7 +1231,6 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
         // 定义一个日期格式化器
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         // 打印最近七天的日期
-        System.out.println("最近七天的日期:");
         for (int i = 0; i < 7; i++) {
             LocalDate date = today.minusDays(i);
             days.add(date.format(formatter));

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

@@ -100,9 +100,10 @@ public class QcCheckTaskDefectController extends BaseController {
     /**
      * PC不良数据获取
      */
-    @GetMapping("/getDefectValue/{belongToDetail}")
+    @GetMapping("/getDefectValue/{belongToDetail}/{checkType}")
-    public TableDataInfo getDefectValue(@PathVariable String belongToDetail) {
+    public TableDataInfo getDefectValue(@PathVariable("belongToDetail") String belongToDetail,
-        List<QcCheckTaskDefect> list = qcCheckTaskDefectService.getDefectListByBelongToDetail(belongToDetail);
+                                        @PathVariable("checkType") String checkType) {
+        List<QcCheckTaskDefect> list = qcCheckTaskDefectService.getDefectListByBelongToDetail(belongToDetail,checkType);
         return getDataTable(list);
     }
 

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

@@ -1,6 +1,7 @@
 package com.op.quality.domain;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -94,6 +95,24 @@ public class QcCheckTaskDefect extends BaseEntity {
     private String defectNames;
     private String defectQualitys;
     private String classId;
+    private String className;
+    private List<QcDefectTypeClass> classList;
+
+    public List<QcDefectTypeClass> getClassList() {
+        return classList;
+    }
+
+    public void setClassList(List<QcDefectTypeClass> classList) {
+        this.classList = classList;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
 
     public String getClassId() {
         return classId;

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

@@ -7,6 +7,7 @@ import com.op.quality.domain.QcCheckTaskDefect;
 import com.op.quality.domain.QcCheckTaskDetail;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 来料检验任务--不良数量Mapper接口
@@ -55,7 +56,7 @@ public interface QcCheckTaskDefectMapper {
      * @return 结果
      */
     public int deleteQcCheckTaskDefectByRecordId(String recordId);
-
+    public int deleteQcCheckTaskDefectByDetailId(String belongToDetail);
     /**
      * 批量删除来料检验任务--不良数量
      *
@@ -70,6 +71,7 @@ public interface QcCheckTaskDefectMapper {
     @MapKey("belongToDetail")
     public Map<String, QcCheckTaskDefect> getDefectMap(QcCheckTaskDetail qcCheckTaskDetail);
 
-    public List<QcCheckTaskDefect> getDefectListByBelongToDetail(String belongToDetail);
+    public List<QcCheckTaskDefect> getDefectListByBelongToDetail(@Param("belongToDetail") String belongToDetail,
+                                                                 @Param("checkType") String checkType);
 
 }

op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskDefectService.java

@@ -67,5 +67,5 @@ public interface IQcCheckTaskDefectService {
 
     public int updateDefectValue(List<QcCheckTaskDefect> qcCheckTaskDefects);
 
-    public List<QcCheckTaskDefect> getDefectListByBelongToDetail(String belongToDetail);
+    public List<QcCheckTaskDefect> getDefectListByBelongToDetail(String belongToDetail,String checkType);
 }

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

@@ -7,6 +7,8 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.op.common.core.utils.DateUtils;
 import com.op.common.core.utils.uuid.IdUtils;
 import com.op.common.security.utils.SecurityUtils;
+import com.op.quality.domain.QcDefectTypeClass;
+import com.op.quality.mapper.QcDefectTypeClassMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.op.quality.mapper.QcCheckTaskDefectMapper;
@@ -27,7 +29,8 @@ import javax.servlet.http.HttpServletRequest;
 public class QcCheckTaskDefectServiceImpl implements IQcCheckTaskDefectService {
     @Autowired
     private QcCheckTaskDefectMapper qcCheckTaskDefectMapper;
-
+    @Autowired
+    private QcDefectTypeClassMapper qcDefectTypeClassMapper;
     /**
      * 查询来料检验任务--不良数量
      *
@@ -134,11 +137,16 @@ public class QcCheckTaskDefectServiceImpl implements IQcCheckTaskDefectService {
         String key = "#header.poolName";
         String factoryCode = request.getHeader(key.substring(8)).replace("ds_","");
         int count = 0;
+        //先逻辑删除所有的
+        qcCheckTaskDefectMapper.deleteQcCheckTaskDefectByDetailId(qcCheckTaskDefects.get(0).getBelongToDetail());
         for (QcCheckTaskDefect defect : qcCheckTaskDefects) {
             defect.setRecordId(IdUtils.fastSimpleUUID());
             defect.setCreateBy(userName);
             defect.setCreateTime(now);
             defect.setFactoryCode(factoryCode);
+            //belongTo;
+            //belongToDetail;
+            //classId,noOkQuality已经有了
             count += qcCheckTaskDefectMapper.insertQcCheckTaskDefect(defect);
         }
         return count;
@@ -165,8 +173,15 @@ public class QcCheckTaskDefectServiceImpl implements IQcCheckTaskDefectService {
 
     @Override
     @DS("#header.poolName")
-    public List<QcCheckTaskDefect> getDefectListByBelongToDetail(String belongToDetail) {
+    public List<QcCheckTaskDefect> getDefectListByBelongToDetail(String belongToDetail,String checkType) {
-        List<QcCheckTaskDefect> defectList = qcCheckTaskDefectMapper.getDefectListByBelongToDetail(belongToDetail);
+        List<QcCheckTaskDefect> defectList = qcCheckTaskDefectMapper.getDefectListByBelongToDetail(belongToDetail,checkType);
+        QcDefectTypeClass qcDefectTypeClass = null;
+        for(QcCheckTaskDefect dto:defectList){
+            qcDefectTypeClass=new QcDefectTypeClass();
+            qcDefectTypeClass.setDefectCode(dto.getDefectCode());
+            List<QcDefectTypeClass> classInfoList = qcDefectTypeClassMapper.getClassInfoList(qcDefectTypeClass);
+            dto.setClassList(classInfoList);
+        }
         return defectList;
     }
 }

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

@@ -111,6 +111,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 	@DS("#header.poolName")
 	public QcCheckTaskIncome selectQcCheckTaskIncomeByRecordId(String recordId) {
 		QcCheckTaskIncome qcCheckTaskIncome = qcCheckTaskIncomeMapper.selectQcCheckTaskIncomeByRecordId(recordId);
+		qcCheckTaskIncome.setAttr3(qcCheckTaskIncome.getBz());
 		//获取拼接好的检验人员信息
 		QcCheckTaskUser qcCheckTaskUser = qcCheckTaskUserService.selectQcCheckTaskUserByBelongTo(recordId);
 		if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManNames())) {
@@ -726,6 +727,10 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		qcCheckTask.setSccj(qcCheckTaskIncome.getSccj());// 所属车间
 		qcCheckTask.setSqr(qcCheckTaskIncome.getSqr());// 申请人Id
 
+		qcCheckTask.setCxzz(qcCheckTaskIncome.getCxzz());//
+		qcCheckTask.setJgy(qcCheckTaskIncome.getJgy());//
+		qcCheckTask.setPgy(qcCheckTaskIncome.getPgy());//
+
 		BigDecimal sampleQuality = new BigDecimal("0");
 		for(QcCheckTaskDetail detail:details){
 			detail.setUpdateTime(nowTime);

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

@@ -3,7 +3,6 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.op.quality.mapper.QcCheckTaskDefectMapper">
-
     <resultMap type="QcCheckTaskDefect" id="QcCheckTaskDefectResult">
         <result property="recordId" column="record_id"/>
         <result property="defectCode" column="defect_code"/>
@@ -22,6 +21,8 @@
         <result property="okQuality" column="ok_quality"/>
         <result property="noOkQuality" column="noOk_quality"/>
         <result property="belongToDetail" column="belong_to_detail"/>
+        <result property="classId" column="class_id"/>
+        <result property="className" column="class_name"/>
     </resultMap>
 
     <sql id="selectQcCheckTaskDefectVo">
@@ -70,6 +71,7 @@
             <if test="okQuality != null">ok_quality,</if>
             <if test="noOkQuality != null">noOk_quality,</if>
             <if test="belongToDetail != null">belong_to_detail,</if>
+            <if test="classId != null">class_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="recordId != null">#{recordId},</if>
@@ -89,6 +91,7 @@
             <if test="okQuality != null">#{okQuality},</if>
             <if test="noOkQuality != null">#{noOkQuality},</if>
             <if test="belongToDetail != null">#{belongToDetail},</if>
+            <if test="classId != null">#{classId},</if>
         </trim>
     </insert>
 
@@ -110,6 +113,8 @@
             <if test="belongTo != null">belong_to = #{belongTo},</if>
             <if test="okQuality != null">ok_quality = #{okQuality},</if>
             <if test="noOkQuality != null">noOk_quality = #{noOkQuality},</if>
+            <if test="belongToDetail != null">belong_to_detail = #{belongToDetail},</if>
+            <if test="classId != null">class_id = #{classId},</if>
         </trim>
         where record_id = #{recordId}
     </update>
@@ -118,6 +123,10 @@
 		update qc_check_task_defect set del_flag = '1' where record_id = #{recordId}
 	</delete>
 
+    <delete id="deleteQcCheckTaskDefectByDetailId" parameterType="String">
+        update qc_check_task_defect set del_flag = '1' where belong_to_detail = #{belongToDetail}
+    </delete>
+
     <delete id="deleteQcCheckTaskDefectByRecordIds" parameterType="String">
         update qc_check_task_defect set del_flag = '1' where record_id in
         <foreach item="recordId" collection="array" open="(" separator="," close=")">
@@ -172,10 +181,17 @@
     </select>
 
     <select id="getDefectListByBelongToDetail" resultMap="QcCheckTaskDefectResult">
-        SELECT record_id,defect_code, defect_subclass,ok_quality, noOk_quality,belong_to,belong_to_detail
+        select qdt.defect_code,
-        FROM qc_check_task_defect
+               qdt.defect_subclass,
-        WHERE del_flag = '0' and belong_to_detail = #{belongToDetail}
+               qctd.class_id,
-        order by defect_code
+               qctd.noOk_quality,
+               qdtc.class_name
+        from qc_defect_type qdt
+                 left join qc_check_task_defect qctd on qctd.defect_code = qdt.defect_code and qctd.del_flag = '0'
+                                                            and qctd.belong_to_detail = #{belongToDetail}
+                 left join qc_defect_type_class qdtc on qdtc.id = qctd.class_id and qdtc.del_flag = '0'
+        where qdt.defect_type = #{checkType} and qdt.del_flag='0'
+        order by qdt.create_time,qdtc.sort
     </select>
 
 </mapper>

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

@@ -40,6 +40,8 @@
         <result property="orderType" column="order_type"/>
         <result property="orderTypeDesc" column="order_type_desc"/>
         <result property="remark" column="remark"/>
+        <result property="remarkCode" column="remark_code"/>
+        <result property="bz" column="bz"/>
     </resultMap>
 
     <sql id="selectQcCheckTaskIncomeVo">
@@ -47,7 +49,7 @@
 		       supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code,
 		       check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by,
 		       create_time, update_by, update_time, factory_code, del_flag , check_type,sample_quality, noOk_quality,
-               order_type,order_type_desc,remark
+               order_type,order_type_desc,remark,attr3,remark_code,bz
 		from qc_check_task
 	</sql>
 
@@ -389,6 +391,9 @@
             <if test="aNoOkquality != null">aNoOkquality,</if>
             <if test="bNoOkquality != null">bNoOkquality,</if>
             <if test="cNoOkquality != null">cNoOkquality,</if>
+            <if test="cxzz != null">cxzz,</if>
+            <if test="jgy != null">jgy,</if>
+            <if test="pgy != null">pgy,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="recordId != null">#{recordId},</if>
@@ -448,6 +453,9 @@
             <if test="aNoOkquality != null">#{aNoOkquality},</if>
             <if test="bNoOkquality != null">#{bNoOkquality},</if>
             <if test="cNoOkquality != null">#{cNoOkquality},</if>
+            <if test="cxzz != null">#{cxzz},</if>
+            <if test="jgy != null">#{jgy},</if>
+            <if test="pgy != null">#{pgy},</if>
         </trim>
     </insert>
 
@@ -487,6 +495,9 @@
         <if test="pgzr != null">pgzr = #{pgzr},</if>
         <if test="sfgyswt != null">sfgyswt = #{sfgyswt},</if>
         <if test="sccj != null">sccj = #{sccj},</if>
+        <if test="cxzz != null">cxzz = #{cxzz},</if>
+        <if test="jgy != null">jgy =  #{jgy},</if>
+        <if test="pgy != null">pgy = #{pgy},</if>
         check_result = #{checkResult},
         update_by = #{updateBy},
         update_time = #{updateTime}
@@ -497,7 +508,7 @@
                supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code,
                check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by,
                create_time, update_by, update_time, factory_code, del_flag , check_type,sample_quality, noOk_quality,
-               order_type,order_type_desc
+               order_type,order_type_desc,cxzz,jgy,pgy
         from qc_check_task_cg
         where record_id = #{recordId}
     </select>