首检测试

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

@@ -240,6 +240,11 @@ public class QcStaticTableController extends BaseController {
 		return qcStaticTableService.getSupplierList(typeCode);
 	}
 
+	@GetMapping("/getProjectList/{checkType}")
+	public List<QcStaticTable> getProjectList(@PathVariable("checkType") String checkType) {
+		return qcStaticTableService.getProjectList(checkType);
+	}
+
 	/**
 	 * 巡检记录报表
 	 */
@@ -318,8 +323,4 @@ public class QcStaticTableController extends BaseController {
 	public QcStaticTable getDLTableAvgInfo(QcStaticTable qcStaticTable) {
 		return qcStaticTableService.getDLTableAvgInfo(qcStaticTable);
 	}
-	@GetMapping("/getDLDetailList")
-	public List<QcStaticTable> getDLDetailList(QcStaticTable qcStaticTable) {
-		return qcStaticTableService.getDLDetailList(qcStaticTable);
-	}
 }

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

@@ -66,4 +66,6 @@ public interface QcStaticTableMapper {
 	Map<String, QcStaticTable> picsMap(QcStaticTable qcStaticTable);
 
     List<QcStaticTable> getDLTableTitle(QcStaticTable qcStaticTable);
+
+    List<QcStaticTable> getProjectList(String checkType);
 }

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

@@ -46,5 +46,5 @@ public interface IQcStaticTableService {
 
     QcStaticTable getDLTableAvgInfo(QcStaticTable qcStaticTable);
 
-    List<QcStaticTable> getDLDetailList(QcStaticTable qcStaticTable);
+    List<QcStaticTable> getProjectList(String checkType);
 }

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

@@ -649,10 +649,11 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			qcCheckTaskIncome.setCheckResult(result.equals("Y")?"1":"2");
 			qcCheckUnqualifiedMapper.updateQualityStatus(qcCheckTaskIncome);
 		}else if("produce".equals(qcCheckTaskIncome.getTypeCode())){
-			/**pro_order_workorder_batch-->status->w5**/
+
-			qcCheckTaskIncome.setStatus("2");
-			qcCheckUnqualifiedMapper.updateWorkOrderBatchStatus(qcCheckTaskIncome);
 			if("checkTypeSC".equals(qcCheckTaskIncome.getCheckType())&&"N".equals(result)){
+				/**pro_order_workorder_batch-->qc_status->2**/
+				qcCheckTaskIncome.setStatus("2");
+				qcCheckUnqualifiedMapper.updateWorkOrderBatchStatus(qcCheckTaskIncome);
 
 				QcCheckTaskIncome recheck = new QcCheckTaskIncome();
 				recheck.setOldBelongTo(belongId);

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

@@ -532,8 +532,8 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
 
 	@Override
 	@DS("#header.poolName")
-	public List<QcStaticTable> getDLDetailList(QcStaticTable qcStaticTable) {
+	public List<QcStaticTable> getProjectList(String checkType) {
-		return null;
+		return qcStaticTableMapper.getProjectList(checkType);
 	}
 
 	private List<String> getHourProductionTitle(QcStaticTable qcStaticTable) {

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

@@ -275,7 +275,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where order_no = #{orderNo}
 	</update>
 	<update id="updateWorkOrderBatchStatus">
-		update pro_order_workorder_batch set qc_status = #{status} where batch_code = #{incomeBatchNo} and check_type = #{checkType}
+		update pro_order_workorder_batch set qc_status = #{status} where batch_code = #{incomeBatchNo}
 	</update>
 	<update id="updatePutStatus">
 		update wms_product_put set check_status = #{status} where batch_number = #{incomeBatchNo}

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

@@ -303,4 +303,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			 ) q
 		GROUP BY q.material_code,q.material_name, q.ymdms,q.rule_name,q.project_no
 	</select>
+    <select id="getProjectList" resultType="com.op.quality.domain.QcStaticTable">
+
+	</select>
 </mapper>