diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
index 31e385b3..032daac2 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
@@ -249,6 +249,8 @@ public class QcFAIRecordData extends QueryPage {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date submitDate;
+ private Integer orderId;
+
public Date getSubmitDate() {
return submitDate;
}
@@ -1119,4 +1121,12 @@ public class QcFAIRecordData extends QueryPage {
public void setSupplierNo(String supplierNo) {
this.supplierNo = supplierNo;
}
+
+ public Integer getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(Integer orderId) {
+ this.orderId = orderId;
+ }
}
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
index d6154061..227844c5 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
@@ -1842,6 +1842,7 @@ public class QcServiceImpl implements QcService {
faiRecordData.setMaxValue(qcTemplateData.getMaxValue()); // 最大值
faiRecordData.setValueType(qcTemplateData.getValueType()); // 检测值类型
faiRecordData.setValueTypeDb(qcTemplateData.getValueTypeDb());
+ faiRecordData.setOrderId(qcTemplateData.getOrderId());
// 获取抽样数量
// 如果该检验项目有维护抽样方案
if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) {
@@ -1944,6 +1945,7 @@ public class QcServiceImpl implements QcService {
faiRecordData.setMaxValue(qcTemplateData.getMaxValue()); // 最大值
faiRecordData.setValueType(qcTemplateData.getValueType()); // 检测值类型
faiRecordData.setValueTypeDb(qcTemplateData.getValueTypeDb());
+ faiRecordData.setOrderId(qcTemplateData.getOrderId());
// 获取抽样数量
// 如果该检验项目有维护抽样方案
if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) {
@@ -2037,6 +2039,7 @@ public class QcServiceImpl implements QcService {
faiRecordData.setMaxValue(qcTemplateData.getMaxValue()); // 最大值
faiRecordData.setValueType(qcTemplateData.getValueType()); // 检测值类型
faiRecordData.setValueTypeDb(qcTemplateData.getValueTypeDb());
+ faiRecordData.setOrderId(qcTemplateData.getOrderId());
// 获取抽样数量
// 如果该检验项目有维护抽样方案
if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) {
@@ -2515,6 +2518,7 @@ public class QcServiceImpl implements QcService {
faiRecordData.setMaxValue(qcTemplateData.getMaxValue()); // 最大值
faiRecordData.setValueType(qcTemplateData.getValueType()); // 检测值类型
faiRecordData.setValueTypeDb(qcTemplateData.getValueTypeDb());
+ faiRecordData.setOrderId(qcTemplateData.getOrderId());
// 获取抽样数量
// 如果该检验项目有维护抽样方案
if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) {
@@ -2616,6 +2620,7 @@ public class QcServiceImpl implements QcService {
faiRecordData.setMaxValue(qcTemplateData.getMaxValue()); // 最大值
faiRecordData.setValueType(qcTemplateData.getValueType()); // 检测值类型
faiRecordData.setValueTypeDb(qcTemplateData.getValueTypeDb());
+ faiRecordData.setOrderId(qcTemplateData.getOrderId());
// 获取抽样数量
// 如果该检验项目有维护抽样方案
if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) {
@@ -2709,6 +2714,7 @@ public class QcServiceImpl implements QcService {
faiRecordData.setMaxValue(qcTemplateData.getMaxValue()); // 最大值
faiRecordData.setValueType(qcTemplateData.getValueType()); // 检测值类型
faiRecordData.setValueTypeDb(qcTemplateData.getValueTypeDb());
+ faiRecordData.setOrderId(qcTemplateData.getOrderId());
// 获取抽样数量
// 如果该检验项目有维护抽样方案
if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) {
@@ -3132,6 +3138,7 @@ public class QcServiceImpl implements QcService {
faiRecordData.setMaxValue(qcTemplateData.getMaxValue()); // 最大值
faiRecordData.setValueType(qcTemplateData.getValueType()); // 检测值类型
faiRecordData.setValueTypeDb(qcTemplateData.getValueTypeDb());
+ faiRecordData.setOrderId(qcTemplateData.getOrderId());
// 获取抽样数量
// 如果该检验项目有维护抽样方案
if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) {
@@ -3234,6 +3241,7 @@ public class QcServiceImpl implements QcService {
faiRecordData.setMaxValue(qcTemplateData.getMaxValue()); // 最大值
faiRecordData.setValueType(qcTemplateData.getValueType()); // 检测值类型
faiRecordData.setValueTypeDb(qcTemplateData.getValueTypeDb());
+ faiRecordData.setOrderId(qcTemplateData.getOrderId());
// 获取抽样数量
// 如果该检验项目有维护抽样方案
if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) {
@@ -3327,6 +3335,7 @@ public class QcServiceImpl implements QcService {
faiRecordData.setMaxValue(qcTemplateData.getMaxValue()); // 最大值
faiRecordData.setValueType(qcTemplateData.getValueType()); // 检测值类型
faiRecordData.setValueTypeDb(qcTemplateData.getValueTypeDb());
+ faiRecordData.setOrderId(qcTemplateData.getOrderId());
// 获取抽样数量
// 如果该检验项目有维护抽样方案
if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) {
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 9687cac2..45bba5f7 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -1559,8 +1559,8 @@
- INSERT INTO qc_fai_detailed_record (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value, value_type_db, value_type, site, sampling_qty, bu_no)
- VALUES(#{inspectionNo}, #{orderNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc}, #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL}, #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{samplingQty,jdbcType=DECIMAL}, #{buNo})
+ INSERT INTO qc_fai_detailed_record (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value, value_type_db, value_type, site, sampling_qty, bu_no,order_id)
+ VALUES(#{inspectionNo}, #{orderNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc}, #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL}, #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{samplingQty,jdbcType=DECIMAL}, #{buNo},#{orderId,jdbcType=INTEGER})
@@ -1721,6 +1721,8 @@
LEFT JOIN qc_method_item as b on a.site = b.site and a.item_no = b.ItemNo and a.bu_no = b.bu_no
LEFT JOIN qc_method as c on b.site = c.site and b.method_no = c.method_no and b.bu_no = c.bu_no
WHERE a.inspection_no = #{inspectionNo} and a.site = #{site} and a.bu_no = #{buNo}
+
+ order by a.order_id
@@ -1892,8 +1894,8 @@
- INSERT INTO qc_ipqc_detailed_record (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value, value_type_db, value_type, site, sampling_qty, bu_no)
- VALUES(#{inspectionNo}, #{orderNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc}, #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL}, #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{samplingQty,jdbcType=DECIMAL}, #{buNo})
+ INSERT INTO qc_ipqc_detailed_record (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value, value_type_db, value_type, site, sampling_qty, bu_no,order_id)
+ VALUES(#{inspectionNo}, #{orderNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc}, #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL}, #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{samplingQty,jdbcType=DECIMAL}, #{buNo},#{orderId,jdbcType=INTEGER})
@@ -2055,6 +2057,8 @@
LEFT JOIN qc_method_item as b on a.site = b.site and a.item_no = b.ItemNo and a.bu_no = b.bu_no
LEFT JOIN qc_method as c on b.site = c.site and b.method_no = c.method_no and b.bu_no = c.bu_no
WHERE a.inspection_no = #{inspectionNo} and a.site = #{site} and a.bu_no = #{buNo}
+
+ order by a.order_id
@@ -2262,8 +2266,8 @@
- INSERT INTO qc_iqc_detailed_record (inspection_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value, value_type_db, value_type, site, sampling_qty, bu_no)
- VALUES(#{inspectionNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc}, #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL}, #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{samplingQty}, #{buNo})
+ INSERT INTO qc_iqc_detailed_record (inspection_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value, value_type_db, value_type, site, sampling_qty, bu_no,order_id)
+ VALUES(#{inspectionNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc}, #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL}, #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{samplingQty}, #{buNo},#{orderId,jdbcType=INTEGER})
@@ -2438,6 +2442,7 @@
LEFT JOIN qc_method_item as b on a.site = b.site and a.item_no = b.ItemNo and a.bu_no = b.bu_no
LEFT JOIN qc_method as c on b.site = c.site and b.method_no = c.method_no and b.bu_no = c.bu_no
WHERE a.inspection_no = #{inspectionNo} and a.site = #{site} and a.bu_no = #{buNo}
+ order by a.order_id
@@ -2756,8 +2761,8 @@
- INSERT INTO qc_fqc_detailed_record (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value, value_type_db, value_type, site, sampling_qty, bu_no)
- VALUES(#{inspectionNo}, #{orderNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc}, #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL}, #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{samplingQty,jdbcType=DECIMAL}, #{buNo})
+ INSERT INTO qc_fqc_detailed_record (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value, value_type_db, value_type, site, sampling_qty, bu_no,order_id)
+ VALUES(#{inspectionNo}, #{orderNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc}, #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL}, #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{samplingQty,jdbcType=DECIMAL}, #{buNo},#{orderId,jdbcType=INTEGER})
@@ -2804,6 +2809,7 @@
LEFT JOIN qc_method_item as b on a.site = b.site and a.item_no = b.ItemNo and a.bu_no = b.bu_no
LEFT JOIN qc_method as c on b.site = c.site and b.method_no = c.method_no and b.bu_no = c.bu_no
WHERE a.inspection_no = #{inspectionNo} and a.site = #{site} and a.bu_no = #{buNo}
+ order by a.order_id
@@ -3150,6 +3156,8 @@
FROM qc_fai_detailed_record
WHERE site = #{site} and inspection_no = #{inspectionNo} and item_no = #{itemNo} and bu_no = #{buNo}
+
+ order by order_id
@@ -3553,6 +3561,7 @@
from qc_iqc_detailed_record as a
left join eam_properties_item as b on a.site = b.site and a.bu_no = b.bu_no and a.item_no = b.ItemNo
where a.site = #{site} and a.bu_no = #{buNo} and a.inspection_no = #{inspectionNo} and b.ItemType = 'D' and b.inspection_type_no = '105' and b.collection_flag = 'Y'
+ order by a.order_id
@@ -3758,6 +3772,7 @@
from qc_iqc_detailed_record as a
left join eam_properties_item as b on a.site = b.site and a.bu_no = b.bu_no and a.item_no = b.ItemNo
where a.site = #{site} and a.bu_no = #{buNo} and a.inspection_no = #{inspectionNo} and b.ItemType = 'D' and b.inspection_type_no = '105' and b.collection_flag = 'Y'
+ order by a.order_id
+ order by a.order_id
+
delete from Equipment_data_acquisition
@@ -3861,6 +3879,7 @@
from qc_fai_detailed_record
where site = #{site} and bu_no = #{buNo} and inspection_no = #{inspectionNo}
+ order by order_id
getUpItemdata
diff --git a/src/main/resources/mapper/pms/QcReportMapper.xml b/src/main/resources/mapper/pms/QcReportMapper.xml
index bb0486a9..a6680b09 100644
--- a/src/main/resources/mapper/pms/QcReportMapper.xml
+++ b/src/main/resources/mapper/pms/QcReportMapper.xml
@@ -142,7 +142,7 @@
ORDER BY
- a.inspection_no, b.item_no desc
+ a.inspection_no,b.order_id, b.item_no desc
@@ -271,7 +271,7 @@
ORDER BY
- a.inspection_no, b.item_no desc
+ a.inspection_no ,b.order_id, b.item_no desc
@@ -401,7 +401,7 @@
ORDER BY
- a.inspection_no, b.item_no desc
+ a.inspection_no,b.order_id, b.item_no desc
@@ -530,7 +530,7 @@
ORDER BY
- a.inspection_no, b.item_no desc
+ a.inspection_no,b.order_id, b.item_no desc
@@ -672,7 +672,7 @@
ORDER BY
- a.inspection_no, b.item_no, c.num desc
+ a.inspection_no,b.order_id, b.item_no, c.num desc
@@ -1029,7 +1029,7 @@
ORDER BY
- a.inspection_no, b.item_no, c.num desc
+ a.inspection_no,b.order_id, b.item_no, c.num desc
@@ -1388,7 +1388,7 @@
ORDER BY
- a.inspection_no, b.item_no, c.num desc
+ a.inspection_no,b.order_id, b.item_no, c.num desc
@@ -1743,7 +1743,7 @@
ORDER BY
- a.inspection_no, b.item_no, c.num desc
+ a.inspection_no,b.order_id, b.item_no, c.num desc