检验方案、检测项配置增加两项

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

@@ -85,6 +85,26 @@ public class QcCheckProject extends BaseEntity {
     private String materialCode;
     private String typeCode;
     private String groupId;
+    @Excel(name = "检测项分类",readConverterExp = "0=内容物,1=包装")
+    private String itemType;
+    @Excel(name = "合格判定比例")
+    private String judgeRate;
+
+    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 getProjectType() {
         return projectType;

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

@@ -111,6 +111,24 @@ public class QcCheckTypeProject extends BaseEntity {
     private String checkMode;
     private String unit;
     private String weight;
+    private String itemType;
+    private String judgeRate;
+
+    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 getWeight() {
         return weight;

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

@@ -65,6 +65,7 @@ public interface QcCheckProjectMapper {
     public QcCheckProject selectSerialNumber();
 
     public QcCheckProject selectCheckProjectByRuleName(@Param("ruleName") String ruleName,
-                                                       @Param("projectType") String projectType);
+                                                       @Param("projectType") String projectType,
+                                                       @Param("sort") String sort);
 
 }

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

@@ -86,5 +86,4 @@ public interface QcCheckTaskProduceMapper {
     public List<QcCheckTaskProduce> getOrderWorksW2(ProOrderWorkorderDTO qoWork);
 
     public QcCheckTaskProduce getLastXJTask(QcCheckTaskProduce productTask);
-
 }

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

@@ -65,4 +65,6 @@ public interface QcCheckTaskWarehousingMapper {
     int getTodayMaxNum(QcCheckTaskWarehousing qcCheckTaskWarehousing);
 
     List<QcCheckTaskWarehousing> getQcListLoc(QcCheckTaskWarehousing qcCheckTaskWarehousing);
+
+    int updateWorkOrderStauts(QcCheckTaskWarehousing qcCheckTaskWarehousing);
 }

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

@@ -154,7 +154,8 @@ public class QcCheckProjectServiceImpl implements IQcCheckProjectService {
         if (checkResult.isSuccess()) {
             for (QcCheckProject project : projectList) {
                 try {
-                    QcCheckProject pro = qcCheckProjectMapper.selectCheckProjectByRuleName(project.getRuleName(), project.getProjectType());
+                    QcCheckProject pro = qcCheckProjectMapper.selectCheckProjectByRuleName(project.getRuleName(),
+                            project.getProjectType(),project.getSort().toString());
                     if (ObjectUtils.isEmpty(pro)) {
                         BeanValidators.validateWithException(validator, project);
                         project.setId(IdUtils.fastSimpleUUID());

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

@@ -537,7 +537,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		List<QcCheckTaskIncome> dtos = qcCheckUnqualifiedMapper.getProductWorkOrder(qcCheckTaskIncome);
 		for(QcCheckTaskIncome dto:dtos){
 			String statusName = "";
-			if("w5".equals(dto.getStatus())){
+			if("w5".equals(dto.getStatus())){//设计有问题TODO
 				statusName = "质检完成";
 			}else{
 				statusName = "质检未完成";

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

@@ -253,7 +253,13 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
 			item.setFactoryCode(factoryCode);
 			item.setStatus("Y");
 		}
-		return qcCheckTaskDetailMapper.addBatch(items);
+		int s = qcCheckTaskDetailMapper.addBatch(items);
+
+//		/**pro_order_workorder**/
+//		qcCheckTaskWarehousing.setStatus("w6");
+//		qcCheckTaskWarehousingMapper.updateWorkOrderStauts(qcCheckTaskWarehousing);
+		logger.info("qc_check_task_detail:"+s+"成功");
+		return 1;
 	}
 
 	/**
@@ -370,20 +376,18 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
 		List<QcCheckTaskProduce> w3works = qcCheckTaskProduceMapper.getOrderWorksW2(qoWork);
 		for(QcCheckTaskProduce productTask:w3works){
 			QcCheckTaskWarehousing cpTask = new QcCheckTaskWarehousing();
-			BeanUtils.copyProperties(productTask,cpTask);
-
 			productTask.setCheckType("checkTypeCP");//入库检验
 			productTask.setOrderNo(productTask.getWorkorderCode());
+			BeanUtils.copyProperties(productTask,cpTask);
 
-//			//是否已经存在入库检验
+			//是否已经存在入库检验
-//			QcCheckTaskProduce cpTask0 = qcCheckTaskProduceMapper.getLastXJTask(productTask);
+			QcCheckTaskProduce cpTask0 = qcCheckTaskProduceMapper.getLastXJTask(productTask);
-//            if(cpTask0 == null){
+            if(cpTask0 != null){
-//				logger.info("++++++++++++入库检验任务生成:已经存在++++++++++++++");
+				logger.info("++++++++++++入库检验任务生成:已经存在++++++++++++++");
-//			}else{
+			}else{
-//				int m = insertQcCheckTaskWarehousing(cpTask);
+				int m = insertQcCheckTaskWarehousing(cpTask);
-//				logger.info("++++++++++++入库检验任务生成" + m + "++++++++++++++");
+				logger.info("++++++++++++入库检验任务生成" + m + "++++++++++++++");
-//			}
+			}
-
 		}
 		logger.info("++++++++++++" + poolName + "++++入库检验巡检结束++++++++++");
 	}

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

@@ -25,13 +25,16 @@
         <result property="defectLevel" column="defect_level"/>
         <result property="projectType" column="project_type"/>
         <result property="sort" column="sort" />
+        <result property="itemType" column="item_type" />
+        <result property="judgeRate" column="judge_rate" />
     </resultMap>
 
     <sql id="selectQcCheckProjectVo">
 		select id, order_num, rule_name, property_code, check_mode, check_tool, unit_code, check_standard,
 		       attr1, create_by, create_time, update_by, update_time, factory_code, del_flag,sample_plan,
-			   judge,defect_level,project_type,sort
+			   judge,defect_level,project_type,sort,item_type,judge_rate
-		from qc_check_project
+
+        from qc_check_project
 	</sql>
 
     <select id="selectQcCheckProjectList" parameterType="QcCheckProject" resultMap="QcCheckProjectResult">
@@ -81,6 +84,8 @@
             <if test="defectLevel != null">defect_level,</if>
             <if test="projectType != null">project_type,</if>
             <if test="sort != null">sort,</if>
+            <if test="itemType != null">item_type,</if>
+            <if test="judgeRate != null">judge_rate,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -103,6 +108,8 @@
             <if test="defectLevel != null">#{defectLevel},</if>
             <if test="projectType != null">#{projectType},</if>
             <if test="sort != null">#{sort},</if>
+            <if test="itemType != null">#{itemType},</if>
+            <if test="judgeRate != null">#{judgeRate},</if>
         </trim>
     </insert>
 
@@ -128,6 +135,8 @@
             <if test="defectLevel != null">defect_level = #{defectLevel},</if>
             <if test="projectType != null">project_type = #{projectType},</if>
             <if test="sort != null">sort = #{sort},</if>
+            <if test="itemType != null">item_type = #{itemType},</if>
+            <if test="judgeRate != null">judge_rate = #{judgeRate},</if>
         </trim>
         where id = #{id}
     </update>
@@ -151,7 +160,7 @@
 
     <select id="selectCheckProjectByRuleName" resultMap="QcCheckProjectResult">
         <include refid="selectQcCheckProjectVo"/>
-        where rule_name = #{ruleName} and project_type = #{projectType}
+        where rule_name = #{ruleName} and project_type = #{projectType} and sort = #{sort}
     </select>
 
 </mapper>

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

@@ -434,8 +434,8 @@
         left join base_equipment be on be.equipment_code = pow.workorder_name and be.equipment_type_code = 'equ_type_bzx'
         where pow.del_flag = '0'
           and pow.status = #{status} and pow.parent_order = '0'
-          <!--and (pow.product_date = CONVERT(varchar(10),GETDATE(), 120)
+          <!---->and (pow.product_date = CONVERT(varchar(10),GETDATE(), 120)
-                   or pow.product_date = CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120))-->
+                   or pow.product_date = CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120))
     </select>
     <select id="getLastXJTask" resultType="com.op.quality.domain.QcCheckTaskProduce">
         select top 1
@@ -454,9 +454,10 @@
                qct.confirm_man_code confirmManCode,
                qct.confirm_man_name confirmManName
         from qc_check_task qct
-        where qct.check_type = 'checkTypeSCXJ' and qct.del_flag = '0'
+        where qct.check_type = #{checkType} and qct.del_flag = '0'
           and qct.del_flag = '0' and qct.order_no = #{workorderCode}
           <!--and CONVERT(varchar(10),qct.income_time, 120) = CONVERT(varchar(10),GETDATE(), 120)-->
         order by qct.create_time desc
     </select>
+
 </mapper>

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

@@ -213,6 +213,9 @@
         </trim>
         where record_id = #{recordId}
     </update>
+    <update id="updateWorkOrderStauts">
+        update pro_order_workorder set status = #{status} where workorder_code = #{orderNo} and del_flag = '0'
+    </update>
 
     <delete id="deleteQcCheckTaskWarehousingByRecordId" parameterType="String">
 		delete from qc_check_task where record_id = #{recordId}

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

@@ -216,7 +216,8 @@
         standard_value,upper_diff,down_diff,unit,
         sample,sort,
         create_by,create_time,
-        group_id,material_code,property_code
+        group_id,material_code,property_code,
+        item_type,judge_rate
         )values
         <foreach collection="list" index="index" item="item" separator=",">
             (
@@ -224,7 +225,8 @@
             #{item.standardValue},#{item.upperDiff},#{item.downDiff},#{item.unit},
             #{item.sample},#{item.sort},
             #{item.createBy},#{item.createTime},
-            #{item.groupId},#{item.materialCode},#{item.propertyCode}
+            #{item.groupId},#{item.materialCode},#{item.propertyCode},
+            #{item.itemType},#{item.judgeRate}
             )
         </foreach>
     </insert>
@@ -270,18 +272,20 @@
     </delete>
     <select id="getProjectInfoList" resultType="com.op.quality.domain.QcCheckProject">
         select
-        id,
+            id,
-        order_num orderNum,
+            order_num orderNum,
-        rule_name ruleName,
+            rule_name ruleName,
-        property_code propertyCode,
+            property_code propertyCode,
-        check_mode checkMode,
+            check_mode checkMode,
-        check_tool checkTool,
+            check_tool checkTool,
-        unit_code unitCode,
+            unit_code unitCode,
-        check_standard checkStandard,
+            check_standard checkStandard,
-        sample_plan samplePlan,
+            sample_plan samplePlan,
-        sort,
+            sort,
-        judge ,
+            judge ,
-        defect_level defectLevel
+            defect_level defectLevel,
+            item_type itemType,
+            judge_rate judgeRate
         from qc_check_project
         where del_flag = '0'
         <if test="projectType != null">and project_type = #{projectType}</if>
@@ -292,6 +296,7 @@
         <if test="samplePlan != null">and sample_plan = #{samplePlan}</if>
         <if test="materialCode != null">and material_code = #{materialCode}</if>
         )
+        order by sort
     </select>
     <select id="getProjectOptions" resultType="com.op.quality.domain.QcProjectType">
 		select project_type_code projectTypeCode,