Browse Source

2023-09-22,设备和质量修改

java8
杨奉源 2 years ago
parent
commit
9e604bdb6f
  1. 20
      src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
  2. 11
      src/main/java/com/xujie/sys/modules/pms/data/QcSubDetailInformationData.java
  3. 9
      src/main/java/com/xujie/sys/modules/pms/entity/vo/CheckSubDetailValueVo.java
  4. 8
      src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
  5. 60
      src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
  6. 250
      src/main/resources/mapper/pms/QcMapper.xml

20
src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java

@ -141,6 +141,26 @@ public class QcFAIRecordData extends QueryPage {
private String cinvSourceCode;
// sku
private String sku;
// 派工单号
private String seqNo;
// 老卷号
private String batchRollNo;
public String getBatchRollNo() {
return batchRollNo;
}
public void setBatchRollNo(String batchRollNo) {
this.batchRollNo = batchRollNo;
}
public String getSeqNo() {
return seqNo;
}
public void setSeqNo(String seqNo) {
this.seqNo = seqNo;
}
public String getCinvSourceCode() {
return cinvSourceCode;

11
src/main/java/com/xujie/sys/modules/pms/data/QcSubDetailInformationData.java

@ -10,6 +10,8 @@ import java.util.List;
* @return:
**/
public class QcSubDetailInformationData {
// 工厂
private String site;
// 主键ID
private Integer id;
// 检验编码
@ -31,6 +33,15 @@ public class QcSubDetailInformationData {
// 值s
private List<SubDetailValues> subDetailValues;
public String getSite() {
return site;
}
public void setSite(String site) {
this.site = site;
}
public Integer getId() {
return id;
}

9
src/main/java/com/xujie/sys/modules/pms/entity/vo/CheckSubDetailValueVo.java

@ -1,6 +1,7 @@
package com.xujie.sys.modules.pms.entity.vo;
public class CheckSubDetailValueVo {
private String site;
// 检验编码
private String inspectionNo;
// 项目
@ -14,6 +15,14 @@ public class CheckSubDetailValueVo {
// 最小检测值
private Double minValue;
public String getSite() {
return site;
}
public void setSite(String site) {
this.site = site;
}
public String getInspectionNo() {
return inspectionNo;
}

8
src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java

@ -232,7 +232,7 @@ public interface QcMapper {
List<QcFAIRecordData> selectFAIBasicData();
List<QcFAIRecordData> selectPartAttributeByPartNo(String partNo, String attributeType, String inspectionTypeNo, String supplierNo);
List<QcFAIRecordData> selectPartAttributeByPartNo(String site, String partNo, String attributeType, String inspectionTypeNo, String supplierNo);
void saveFAIRecord(QcFAIRecordData data);
@ -306,7 +306,7 @@ public interface QcMapper {
List<SubDetailValues> selectIQCSubDetailedRecord(SubDetailValues data);
List<SubDetailValues> selectIQCSubDetailValue(String inspectionNo, String itemNo);
List<SubDetailValues> selectIQCSubDetailValue(String inspectionNo, String itemNo, String site);
void updateIQCMasterRecord(QcFAIRecordData data);
@ -357,7 +357,7 @@ public interface QcMapper {
List<QcFAIRecordData> getAllResourceList(QcFAIRecordData data);
List<QcFAIRecordData> selectPartAttributeByOperationAndResource(String partNo, String attributeType1, String inspectionTypeNo, String operationDesc, String resourceId);
List<QcFAIRecordData> selectPartAttributeByOperationAndResource(String site, String partNo, String attributeType1, String inspectionTypeNo, String operationDesc, String resourceId);
List<QcFAIRecordData> getOrderNoList(QcFAIRecordData data);
@ -393,7 +393,7 @@ public interface QcMapper {
QcFAIRecordData checkFQCIsSubmit(SubDetailValues data);
List<SubDetailValues> selectFQCSubDetailValue(String inspectionNo, String itemNo);
List<SubDetailValues> selectFQCSubDetailValue(String inspectionNo, String itemNo, String site);
String selectFQCInspectionNo(QcFAIRecordData data);

60
src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java

@ -1651,7 +1651,7 @@ public class QcServiceImpl implements QcService {
if (StringUtils.isNotBlank(data.getResourceId())) {
resourceId = data.getResourceId();
}
List<QcFAIRecordData> partAttribute = qcMapper.selectPartAttributeByOperationAndResource(partNo, attributeType1, data.getInspectionTypeNo(),operationDesc, resourceId);
List<QcFAIRecordData> partAttribute = qcMapper.selectPartAttributeByOperationAndResource(data.getSite(), partNo, attributeType1, data.getInspectionTypeNo(),operationDesc, resourceId);
if (partAttribute != null && partAttribute.size() > 0) {
data.setInspectionCycle(partAttribute.get(0).getInspectionCycle());
// 获取抽样数量
@ -1676,10 +1676,12 @@ public class QcServiceImpl implements QcService {
// 获取根据该检验模板下维护的检验项目
QcTemplateData templateData = new QcTemplateData();
templateData.setSite(data.getSite());
templateData.setTemplateId(partAttribute.get(0).getTemplateId());
templateData.setItemType("D");
List<QcTemplateData> itemList = qcMapper.templateDetailsSearch(templateData);
QcFAIRecordData faiRecordData = new QcFAIRecordData();
faiRecordData.setSite(data.getSite()); // 工厂
faiRecordData.setInspectionNo(data.getInspectionNo()); // 检验单号
faiRecordData.setOrderNo(data.getOrderNo()); // 工单号
faiRecordData.setTemplateId(partAttribute.get(0).getTemplateId()); // 模板编码
@ -1708,7 +1710,7 @@ public class QcServiceImpl implements QcService {
String familyId = qcMapper.selectFamilyIdByPartNo(partNo,data.getSite());
String attributeType2 = "B";
// 获取该类别属性下维护的FAI检验模板
List<QcFAIRecordData> familyAttribute = qcMapper.selectPartAttributeByOperationAndResource(familyId, attributeType2, data.getInspectionTypeNo(),operationDesc, resourceId);
List<QcFAIRecordData> familyAttribute = qcMapper.selectPartAttributeByOperationAndResource(data.getSite(), familyId, attributeType2, data.getInspectionTypeNo(),operationDesc, resourceId);
if (familyAttribute != null && familyAttribute.size() > 0) {
data.setInspectionCycle(familyAttribute.get(0).getInspectionCycle());
// 获取抽样数量
@ -1733,10 +1735,12 @@ public class QcServiceImpl implements QcService {
// 获取根据该检验模板下维护的检验项目
QcTemplateData templateData = new QcTemplateData();
templateData.setSite(data.getSite());
templateData.setTemplateId(familyAttribute.get(0).getTemplateId());
templateData.setItemType("D");
List<QcTemplateData> itemList = qcMapper.templateDetailsSearch(templateData);
QcFAIRecordData faiRecordData = new QcFAIRecordData();
faiRecordData.setSite(data.getSite()); // 工厂
faiRecordData.setInspectionNo(data.getInspectionNo()); // 检验单号
faiRecordData.setOrderNo(data.getOrderNo()); // 工单号
faiRecordData.setTemplateId(familyAttribute.get(0).getTemplateId()); // 模板编码
@ -1871,15 +1875,15 @@ public class QcServiceImpl implements QcService {
@Transactional
public void saveFAISubDetailed(QcSubDetailInformationData data) {
List<SubDetailValues> subDetailValues = data.getSubDetailValues();
for (int i = 0; i < subDetailValues.size(); i++) {
subDetailValues.get(i).setInspectionNo(data.getInspectionNo());
subDetailValues.get(i).setItemNo(data.getItemNo());
}
// 删除子明细的老数据
qcMapper.delFAISubDetailedRecord(data);
if (subDetailValues.size() <= 0){
return;
}
for (int i = 0; i < subDetailValues.size(); i++) {
subDetailValues.get(i).setInspectionNo(data.getInspectionNo());
subDetailValues.get(i).setItemNo(data.getItemNo());
}
// 新增子明细新数据
qcMapper.saveFAISubDetailed(subDetailValues);
}
@ -1957,7 +1961,7 @@ public class QcServiceImpl implements QcService {
if (StringUtils.isNotBlank(data.getResourceId())) {
resourceId = data.getResourceId();
}
List<QcFAIRecordData> partAttribute = qcMapper.selectPartAttributeByOperationAndResource(partNo, attributeType1, data.getInspectionTypeNo(),operationDesc, resourceId);
List<QcFAIRecordData> partAttribute = qcMapper.selectPartAttributeByOperationAndResource(data.getSite(), partNo, attributeType1, data.getInspectionTypeNo(),operationDesc, resourceId);
if (partAttribute != null && partAttribute.size() > 0) {
data.setInspectionCycle(partAttribute.get(0).getInspectionCycle());
// 获取抽样数量
@ -1982,10 +1986,12 @@ public class QcServiceImpl implements QcService {
// 获取根据该检验模板下维护的检验项目
QcTemplateData templateData = new QcTemplateData();
templateData.setSite(data.getSite());
templateData.setTemplateId(partAttribute.get(0).getTemplateId());
templateData.setItemType("D");
List<QcTemplateData> itemList = qcMapper.templateDetailsSearch(templateData);
QcFAIRecordData faiRecordData = new QcFAIRecordData();
faiRecordData.setSite(data.getSite()); // 工厂
faiRecordData.setInspectionNo(data.getInspectionNo()); // 检验单号
faiRecordData.setOrderNo(data.getOrderNo()); // 工单号
faiRecordData.setTemplateId(partAttribute.get(0).getTemplateId()); // 模板编码
@ -2014,7 +2020,7 @@ public class QcServiceImpl implements QcService {
String familyId = qcMapper.selectFamilyIdByPartNo(partNo,data.getSite());
String attributeType2 = "B";
// 获取该类别属性下维护的FQC检验模板
List<QcFAIRecordData> familyAttribute = qcMapper.selectPartAttributeByOperationAndResource(familyId, attributeType2, data.getInspectionTypeNo(),operationDesc, resourceId);
List<QcFAIRecordData> familyAttribute = qcMapper.selectPartAttributeByOperationAndResource(data.getSite(), familyId, attributeType2, data.getInspectionTypeNo(),operationDesc, resourceId);
if (familyAttribute != null && familyAttribute.size() > 0) {
data.setInspectionCycle(familyAttribute.get(0).getInspectionCycle());
// 获取抽样数量
@ -2039,10 +2045,12 @@ public class QcServiceImpl implements QcService {
// 获取根据该检验模板下维护的检验项目
QcTemplateData templateData = new QcTemplateData();
templateData.setSite(data.getSite());
templateData.setTemplateId(familyAttribute.get(0).getTemplateId());
templateData.setItemType("D");
List<QcTemplateData> itemList = qcMapper.templateDetailsSearch(templateData);
QcFAIRecordData faiRecordData = new QcFAIRecordData();
faiRecordData.setSite(data.getSite()); // 工厂
faiRecordData.setInspectionNo(data.getInspectionNo()); // 检验单号
faiRecordData.setOrderNo(data.getOrderNo()); // 工单号
faiRecordData.setTemplateId(familyAttribute.get(0).getTemplateId()); // 模板编码
@ -2153,15 +2161,15 @@ public class QcServiceImpl implements QcService {
@Override
public void saveFQCSubDetailed(QcSubDetailInformationData data) {
List<SubDetailValues> subDetailValues = data.getSubDetailValues();
for (int i = 0; i < subDetailValues.size(); i++) {
subDetailValues.get(i).setInspectionNo(data.getInspectionNo());
subDetailValues.get(i).setItemNo(data.getItemNo());
}
// 删除子明细的老数据
qcMapper.delFQCSubDetailedRecord(data);
if (subDetailValues.size() <= 0){
return;
}
for (int i = 0; i < subDetailValues.size(); i++) {
subDetailValues.get(i).setInspectionNo(data.getInspectionNo());
subDetailValues.get(i).setItemNo(data.getItemNo());
}
// 新增子明细新数据
qcMapper.saveFQCSubDetailed(subDetailValues);
}
@ -2206,7 +2214,7 @@ public class QcServiceImpl implements QcService {
@Override
public Integer checkFQCSubDetailValue(CheckSubDetailValueVo data) {
// 获取该项目的子明细值
List<SubDetailValues> list = qcMapper.selectFQCSubDetailValue(data.getInspectionNo(), data.getItemNo());
List<SubDetailValues> list = qcMapper.selectFQCSubDetailValue(data.getInspectionNo(), data.getItemNo(), data.getSite());
for (int i = 0; i < list.size(); i++) {
if (Double.parseDouble(list.get(i).getSubDetailValue()) > data.getMaxValue() || Double.parseDouble(list.get(i).getSubDetailValue()) < data.getMinValue()){
return 2;
@ -2407,7 +2415,7 @@ public class QcServiceImpl implements QcService {
if (StringUtils.isNotBlank(data.getResourceId())) {
resourceId = data.getResourceId();
}
List<QcFAIRecordData> partAttribute = qcMapper.selectPartAttributeByOperationAndResource(partNo, attributeType1, data.getInspectionTypeNo(),operationDesc, resourceId);
List<QcFAIRecordData> partAttribute = qcMapper.selectPartAttributeByOperationAndResource(data.getSite(), partNo, attributeType1, data.getInspectionTypeNo(),operationDesc, resourceId);
if (partAttribute != null && partAttribute.size() > 0) {
data.setInspectionCycle(partAttribute.get(0).getInspectionCycle());
// 获取抽样数量
@ -2432,10 +2440,12 @@ public class QcServiceImpl implements QcService {
// 获取根据该检验模板下维护的检验项目
QcTemplateData templateData = new QcTemplateData();
templateData.setSite(data.getSite());
templateData.setTemplateId(partAttribute.get(0).getTemplateId());
templateData.setItemType("D");
List<QcTemplateData> itemList = qcMapper.templateDetailsSearch(templateData);
QcFAIRecordData faiRecordData = new QcFAIRecordData();
faiRecordData.setSite(data.getSite()); // 工厂
faiRecordData.setInspectionNo(data.getInspectionNo()); // 检验单号
faiRecordData.setOrderNo(data.getOrderNo()); // 工单号
faiRecordData.setTemplateId(partAttribute.get(0).getTemplateId()); // 模板编码
@ -2464,7 +2474,7 @@ public class QcServiceImpl implements QcService {
String familyId = qcMapper.selectFamilyIdByPartNo(partNo,data.getSite());
String attributeType2 = "B";
// 获取该类别属性下维护的IPQC检验模板
List<QcFAIRecordData> familyAttribute = qcMapper.selectPartAttributeByOperationAndResource(familyId, attributeType2, data.getInspectionTypeNo(),operationDesc, resourceId);
List<QcFAIRecordData> familyAttribute = qcMapper.selectPartAttributeByOperationAndResource(data.getSite(), familyId, attributeType2, data.getInspectionTypeNo(),operationDesc, resourceId);
if (familyAttribute != null && familyAttribute.size() > 0) {
data.setInspectionCycle(familyAttribute.get(0).getInspectionCycle());
// 获取抽样数量
@ -2489,10 +2499,12 @@ public class QcServiceImpl implements QcService {
// 获取根据该检验模板下维护的检验项目
QcTemplateData templateData = new QcTemplateData();
templateData.setSite(data.getSite());
templateData.setTemplateId(familyAttribute.get(0).getTemplateId());
templateData.setItemType("D");
List<QcTemplateData> itemList = qcMapper.templateDetailsSearch(templateData);
QcFAIRecordData faiRecordData = new QcFAIRecordData();
faiRecordData.setSite(data.getSite()); // 工厂
faiRecordData.setInspectionNo(data.getInspectionNo()); // 检验单号
faiRecordData.setOrderNo(data.getOrderNo()); // 工单号
faiRecordData.setTemplateId(familyAttribute.get(0).getTemplateId()); // 模板编码
@ -2605,6 +2617,7 @@ public class QcServiceImpl implements QcService {
public void saveIPQCSubDetailed(QcSubDetailInformationData data) {
List<SubDetailValues> subDetailValues = data.getSubDetailValues();
for (int i = 0; i < subDetailValues.size(); i++) {
subDetailValues.get(i).setSite(data.getSite());
subDetailValues.get(i).setInspectionNo(data.getInspectionNo());
subDetailValues.get(i).setItemNo(data.getItemNo());
}
@ -2760,7 +2773,7 @@ public class QcServiceImpl implements QcService {
String partNo = recordData.getPartNo();
String attributeType1 = "A";
// 获取该物料属性下维护的IQC检验模板
List<QcFAIRecordData> partAttribute = qcMapper.selectPartAttributeByPartNo(partNo, attributeType1, qcFAIRecordData.getInspectionTypeNo(), supplierNo);
List<QcFAIRecordData> partAttribute = qcMapper.selectPartAttributeByPartNo(data.getSite(), partNo, attributeType1, qcFAIRecordData.getInspectionTypeNo(), supplierNo);
if (partAttribute != null && partAttribute.size() > 0){
qcFAIRecordData.setInspectionCycle(partAttribute.get(0).getInspectionCycle()); // 检验周期
// 获取抽样数量
@ -2785,10 +2798,12 @@ public class QcServiceImpl implements QcService {
// 获取根据该检验模板下维护的检验项目
QcTemplateData templateData = new QcTemplateData();
templateData.setSite(data.getSite());
templateData.setTemplateId(partAttribute.get(0).getTemplateId());
templateData.setItemType("D");
List<QcTemplateData> itemList = qcMapper.templateDetailsSearch(templateData);
QcFAIRecordData faiRecordData = new QcFAIRecordData();
faiRecordData.setSite(data.getSite()); // 工厂
faiRecordData.setInspectionNo(qcFAIRecordData.getInspectionNo()); // 检验单号
faiRecordData.setTemplateId(partAttribute.get(0).getTemplateId()); // 模板编码
faiRecordData.setSamplingLevelNo(partAttribute.get(0).getSamplingLevelNo()); // 检验水平编码
@ -2816,7 +2831,7 @@ public class QcServiceImpl implements QcService {
String familyId = qcMapper.selectFamilyIdByPartNo(partNo,data.getSite());
String attributeType2 = "B";
// 获取该类别属性下维护的IQC检验模板
List<QcFAIRecordData> familyAttribute = qcMapper.selectPartAttributeByPartNo(familyId, attributeType2, qcFAIRecordData.getInspectionTypeNo(), supplierNo);
List<QcFAIRecordData> familyAttribute = qcMapper.selectPartAttributeByPartNo(data.getSite(), familyId, attributeType2, qcFAIRecordData.getInspectionTypeNo(), supplierNo);
if (familyAttribute != null && partAttribute.size() > 0) {
// 获取检验周期
qcFAIRecordData.setInspectionCycle(familyAttribute.get(0).getInspectionCycle());
@ -2844,6 +2859,7 @@ public class QcServiceImpl implements QcService {
QcTemplateData templateData = new QcTemplateData();
templateData.setTemplateId(familyAttribute.get(0).getTemplateId());
templateData.setItemType("D");
templateData.setSite(data.getSite());
List<QcTemplateData> itemList = qcMapper.templateDetailsSearch(templateData);
QcFAIRecordData faiRecordData = new QcFAIRecordData();
faiRecordData.setInspectionNo(qcFAIRecordData.getInspectionNo()); // 检验单号
@ -2914,7 +2930,7 @@ public class QcServiceImpl implements QcService {
@Override
public Integer checkIQCSubDetailValue(CheckSubDetailValueVo data) {
// 获取该项目的子明细值
List<SubDetailValues> list = qcMapper.selectIQCSubDetailValue(data.getInspectionNo(), data.getItemNo());
List<SubDetailValues> list = qcMapper.selectIQCSubDetailValue(data.getInspectionNo(), data.getItemNo(), data.getSite());
for (int i = 0; i < list.size(); i++) {
if (Double.parseDouble(list.get(i).getSubDetailValue()) > data.getMaxValue() || Double.parseDouble(list.get(i).getSubDetailValue()) < data.getMinValue()){
return 2;
@ -2969,15 +2985,15 @@ public class QcServiceImpl implements QcService {
@Transactional
public void saveIQCSubDetailed(QcSubDetailInformationData data) {
List<SubDetailValues> subDetailValues = data.getSubDetailValues();
for (int i = 0; i < subDetailValues.size(); i++) {
subDetailValues.get(i).setInspectionNo(data.getInspectionNo());
subDetailValues.get(i).setItemNo(data.getItemNo());
}
// 删除子明细的老数据
qcMapper.delIQCSubDetailedRecord(data);
if (subDetailValues.size() <= 0){
return;
}
for (int i = 0; i < subDetailValues.size(); i++) {
subDetailValues.get(i).setInspectionNo(data.getInspectionNo());
subDetailValues.get(i).setItemNo(data.getItemNo());
}
// 新增子明细新数据
qcMapper.saveIQCSubDetailed(subDetailValues);
}

250
src/main/resources/mapper/pms/QcMapper.xml

@ -419,25 +419,24 @@
<!-- 查询模板里的项目详情 -->
<select id="templateDetailsSearch" resultType="QcTemplateData">
SELECT a.template_id,
a.ItemNo,
b.ItemDesc,
a.default_value,
b.ValueType,
b.ValueType_DB,
a.max_value,
a.min_value,
b.ItemRemark,
b.ItemType,
a.object_id,
eo.objectDesc
SELECT
a.site,
a.template_id,
a.ItemNo,
b.ItemDesc,
a.default_value,
b.ValueType,
b.ValueType_DB,
a.max_value,
a.min_value,
b.ItemRemark,
b.ItemType,
a.object_id,
eo.objectDesc
FROM qc_template_detailed a
LEFT JOIN eam_properties_item b
ON a.ItemNo = b.ItemNo
LEFT JOIN eam_object eo
ON a.object_id = eo.ObjectID
WHERE a.template_id = #{templateId}
AND b.ItemType = #{itemType}
LEFT JOIN eam_properties_item b ON a.ItemNo = b.ItemNo and a.site = b.site
LEFT JOIN eam_object eo ON a.object_id = eo.ObjectID and a.site = b.site
WHERE a.template_id = #{templateId} AND b.ItemType = #{itemType} and a.site = #{site}
</select>
@ -449,8 +448,7 @@
max_value,
min_value
FROM qc_template_detailed
WHERE template_id = #{templateId}
AND ItemNo = #{itemNo}
WHERE template_id = #{templateId} and ItemNo = #{itemNo} and site = #{site}
</select>
<!-- 查询项目的最大最小值 -->
@ -460,32 +458,30 @@
MaxValue,
MinValue
FROM eam_properties_item
WHERE ItemNo = #{itemNo}
AND ItemType = #{itemType}
WHERE ItemNo = #{itemNo} and ItemType = #{itemType} and site = #{site}
</select>
<!-- 新增模板的检验项目 -->
<insert id="addItemDetails" parameterType="QcTemplateData">
INSERT INTO qc_template_detailed (template_id, ItemNo, default_value, max_value, min_value)
VALUES (#{templateId}, #{itemNo}, #{defaultValue}, #{maxValue,jdbcType=DECIMAL}, #{minValue,jdbcType=DECIMAL})
INSERT INTO qc_template_detailed (template_id, ItemNo, default_value, max_value, min_value, site)
VALUES (#{templateId}, #{itemNo}, #{defaultValue}, #{maxValue,jdbcType=DECIMAL}, #{minValue,jdbcType=DECIMAL}, #{site})
</insert>
<!-- 删除模板的检验项目 -->
<delete id="delItemDetails" >
DELETE FROM qc_template_detailed
WHERE template_id = #{templateId}
AND ItemNo = #{itemNo}
WHERE template_id = #{templateId} and ItemNo = #{itemNo} and site = #{site}
</delete>
<!-- 获取当前模板不包含的项目 -->
<select id="getItemList" resultType="QcTemplateData">
SELECT a.itemNo,
a.ItemDesc
SELECT
a.site,
a.itemNo,
a.ItemDesc
FROM eam_properties_item a
LEFT JOIN qc_template_detailed b
ON b.template_id = #{templateId} and b.ItemNo = a.ItemNo
WHERE a.ItemType = #{itemType}
AND b.template_id is null
LEFT JOIN qc_template_detailed b ON b.template_id = #{templateId} and b.ItemNo = a.ItemNo and a.site = b.site
WHERE a.ItemType = #{itemType} and a.site = #{site} and b.template_id is null
</select>
<!-- 删除模板 -->
@ -498,7 +494,7 @@
<!-- 删除模板-项目中间表 -->
<delete id="itemItemDelete" parameterType="QcTemplateData">
DELETE FROM qc_template_detailed
WHERE template_id = #{templateId}
WHERE template_id = #{templateId} and site = #{site}
</delete>
<!-- 搜索所有检验类型 -->
@ -568,8 +564,7 @@
max_value = #{maxValue,jdbcType=DECIMAL},
min_value = #{minValue,jdbcType=DECIMAL},
object_id = #{objectID}
WHERE template_id = #{templateId}
AND ItemNo = #{itemNo}
WHERE template_id = #{templateId} and ItemNo = #{itemNo} and site = #{site}
</update>
<!-- 查询项目明细 -->
@ -1357,10 +1352,11 @@
qt.default_sampling_quantity,
qt.default_sampling_proportion
FROM qc_attribute_template as qat
LEFT JOIN qc_template as qt ON qat.template_id = qt.template_id
LEFT JOIN qc_template as qt ON qat.template_id = qt.template_id and qat.site = qt.site
LEFT JOIN qc_sampling_inspection_level as qsil ON qat.sampling_level_no = qsil.sampling_level_no
LEFT JOIN qc_sampling_inspection_programme as qsip ON qat.sampling_programme_no = qsip.sampling_programme_no
WHERE qat.attribute_no = #{partNo}
WHERE qat.site = #{site}
AND qat.attribute_no = #{partNo}
AND qat.attribute_type = #{attributeType}
AND qt.inspection_type_no = #{inspectionTypeNo}
AND qat.manufacturer_id = #{supplierNo}
@ -1382,10 +1378,11 @@
qt.default_sampling_quantity,
qt.default_sampling_proportion
FROM qc_attribute_template as qat
LEFT JOIN qc_template as qt ON qat.template_id = qt.template_id
LEFT JOIN qc_template as qt ON qat.template_id = qt.template_id and qat.site = qt.site
LEFT JOIN qc_sampling_inspection_level as qsil ON qat.sampling_level_no = qsil.sampling_level_no
LEFT JOIN qc_sampling_inspection_programme as qsip ON qat.sampling_programme_no = qsip.sampling_programme_no
WHERE qat.attribute_no = #{partNo}
WHERE qat.site = #{site}
AND qat.attribute_no = #{partNo}
AND qat.attribute_type = #{attributeType1}
AND qt.inspection_type_no = #{inspectionTypeNo}
AND qat.operation = #{operationDesc}
@ -1395,14 +1392,14 @@
<!-- 新增FAI主记录信息 -->
<insert id="saveFAIRecord" parameterType="QcFAIRecordData">
INSERT INTO qc_fai_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id)
VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId})
INSERT INTO qc_fai_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no)
VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo})
</insert>
<!-- 新增FAI明细记录信息 -->
<insert id="saveFAIDetailedRecord" parameterType="QcFAIRecordData">
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)
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})
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)
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})
</insert>
<!-- 查询FAI主记录信息 -->
@ -1433,7 +1430,9 @@
unqualified_qty,
submit_flag,
dbo.qc_get_cinv_source_code(site, part_no) as cinvSourceCode,
dbo.qc_get_sku(site, part_no) as sku
dbo.qc_get_sku(site, part_no) as sku,
seq_no,
batch_roll_no
FROM qc_fai_record
<where>
site = #{query.site}
@ -1477,6 +1476,7 @@
<!-- FAI明细记录查询 -->
<select id="faiDetailSearch" parameterType="QcFAIRecordData" resultType="QcFAIRecordData">
SELECT
site,
inspection_no,
order_no,
template_id,
@ -1500,7 +1500,7 @@
is_submit,
unqualified_quantity
FROM qc_fai_detailed_record
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</select>
<!-- 修改FAI主记录信息 -->
@ -1522,7 +1522,7 @@
UPDATE qc_fai_detailed_record
SET item_result = #{itemResult},
unqualified_quantity = #{unqualifiedQuantity,jdbcType=DECIMAL}
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo}
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
</update>
<!-- 修改子明细提交标识 -->
@ -1541,13 +1541,13 @@
<!-- 删除FAI明细记录信息 -->
<delete id="deleteFAIDetailedRecord" parameterType="QcFAIRecordData">
DELETE FROM qc_fai_detailed_record
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</delete>
<!-- 删除FAI子明细记录信息 -->
<delete id="deleteFAISubDetailedRecord" parameterType="QcFAIRecordData">
DELETE FROM qc_fai_sub_detail_record
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</delete>
<!-- 修改FAI主记录标识为已提交 -->
@ -1562,14 +1562,14 @@
<update id="updateFAIDetailSubmitFlag" parameterType="QcFAIRecordData">
UPDATE qc_fai_detailed_record
SET is_submit = 'Y'
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</update>
<!-- 修改子明细记录标识为已提交 -->
<update id="updateFAISubDetailSubmitFlag" parameterType="QcFAIRecordData">
UPDATE qc_fai_sub_detail_record
SET is_submit = 'Y'
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</update>
<!-- 查询FAI检验记录是否已提交 -->
@ -1582,26 +1582,28 @@
<!-- 删除子明细的老数据 -->
<delete id="delFAISubDetailedRecord" parameterType="QcSubDetailInformationData">
DELETE FROM qc_fai_sub_detail_record
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo}
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
</delete>
<!-- 新增子明细信息 -->
<insert id="saveFAISubDetailed">
INSERT INTO qc_fai_sub_detail_record
(inspection_no, item_no, sub_detail_value, sampling_location)
(inspection_no, item_no, sub_detail_value, sampling_location, site)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation})
(#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site})
</foreach>
</insert>
<!-- 查询FAI的子明细 -->
<select id="selectFAISubDetailedRecord" parameterType="SubDetailValues" resultType="SubDetailValues">
SELECT sub_detail_value,
sampling_location,
is_submit
SELECT
site,
sub_detail_value,
sampling_location,
is_submit
FROM qc_fai_sub_detail_record
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo}
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
</select>
<!-- 获取该项目的子明细值 -->
@ -1610,7 +1612,7 @@
sampling_location,
is_submit
FROM qc_fai_sub_detail_record
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo}
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
</select>
<!-- ================================================= IPQC检验维护 ================================================= -->
@ -1653,14 +1655,14 @@
<!-- 新增IPQC明细记录信息 -->
<insert id="saveIPQCDetailedRecord" parameterType="QcFAIRecordData">
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)
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})
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)
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})
</insert>
<!-- 新增IPQC主记录信息 -->
<insert id="saveIPQCRecord" parameterType="QcFAIRecordData">
INSERT INTO qc_ipqc_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id)
VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId})
INSERT INTO qc_ipqc_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no)
VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo})
</insert>
<!-- 查询IPQC主记录信息 -->
@ -1691,7 +1693,9 @@
unqualified_qty,
submit_flag,
dbo.qc_get_cinv_source_code(site, part_no) as cinvSourceCode,
dbo.qc_get_sku(site, part_no) as sku
dbo.qc_get_sku(site, part_no) as sku,
seq_no,
batch_roll_no
FROM qc_ipqc_record
<where>
site = #{query.site}
@ -1733,6 +1737,7 @@
<!-- IPQC明细记录查询 -->
<select id="ipqcDetailSearch" parameterType="QcFAIRecordData" resultType="QcFAIRecordData">
SELECT
site,
inspection_no,
order_no,
template_id,
@ -1756,7 +1761,7 @@
is_submit,
unqualified_quantity
FROM qc_ipqc_detailed_record
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</select>
<!-- 删除IPQC检验记录 -->
@ -1768,13 +1773,13 @@
<!-- 删除IPQC明细记录信息 -->
<delete id="deleteIPQCDetailedRecord" parameterType="QcFAIRecordData">
DELETE FROM qc_ipqc_detailed_record
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</delete>
<!-- 删除IPQC子明细记录信息 -->
<delete id="deleteIPQCSubDetailedRecord" parameterType="QcFAIRecordData">
DELETE FROM qc_ipqc_sub_detail_record
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</delete>
<!-- 修改IPQC主记录信息 -->
@ -1795,7 +1800,7 @@
UPDATE qc_ipqc_detailed_record
SET item_result = #{itemResult},
unqualified_quantity = #{unqualifiedQuantity,jdbcType=DECIMAL}
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo}
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
</update>
<!-- 修改IPQC主记录标识为已提交 -->
@ -1810,29 +1815,29 @@
<update id="updateIPQCDetailSubmitFlag" parameterType="QcFAIRecordData">
UPDATE qc_ipqc_detailed_record
SET is_submit = 'Y'
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</update>
<!-- 修改IPQC子明细记录标识为已提交 -->
<update id="updateIPQCSubDetailSubmitFlag" parameterType="QcFAIRecordData">
UPDATE qc_ipqc_sub_detail_record
SET is_submit = 'Y'
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</update>
<!-- 删除IPQC子明细的老数据 -->
<delete id="delIPQCSubDetailedRecord" parameterType="QcSubDetailInformationData">
DELETE FROM qc_ipqc_sub_detail_record
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo}
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
</delete>
<!-- 新增IPQC子明细信息 -->
<insert id="saveIPQCSubDetailed">
INSERT INTO qc_ipqc_sub_detail_record
(inspection_no, item_no, sub_detail_value, sampling_location)
(inspection_no, item_no, sub_detail_value, sampling_location, site)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation})
(#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site})
</foreach>
</insert>
@ -1842,7 +1847,7 @@
sampling_location,
is_submit
FROM qc_ipqc_sub_detail_record
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo}
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
</select>
<!-- 查询IPQC检验记录是否已提交 -->
@ -1858,7 +1863,7 @@
sampling_location,
is_submit
FROM qc_ipqc_sub_detail_record
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo}
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
</select>
<!-- 查询工序列表 -->
@ -1869,12 +1874,9 @@
c.operation_desc as operationDesc,
a.itemno as operationNo
FROM soscheduledrouting as a
LEFT JOIN sfdc as b
ON a.site = b.site and a.seqno = b.assjob_seq_no
LEFT JOIN so_routing as c
ON c.order_no = a.orderno and a.itemno = c.item_no and c.site = a.site
LEFT JOIN part j
ON a.site = j.site and a.part_no = j.part_no
LEFT JOIN sfdc as b ON a.site = b.site and a.seqno = b.assjob_seq_no
LEFT JOIN so_routing as c ON c.order_no = a.orderno and a.itemno = c.item_no and c.site = a.site
LEFT JOIN part j ON a.site = j.site and a.part_no = j.part_no
WHERE b.approve_qty is not null and a.orderno = #{orderNo}
ORDER BY a.id desc
</select>
@ -1929,13 +1931,13 @@
qir.po_orderNo,
qir.po_itemNo
FROM qc_iqc_record as qir
LEFT JOIN part p ON qir.part_no = p.part_no
LEFT JOIN part p ON qir.part_no = p.part_no and qir.site = p.site
</select>
<!-- 新增IQC明细记录信息 -->
<insert id="saveIQCDetailedRecord" parameterType="QcFAIRecordData">
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)
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})
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)
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})
</insert>
<!-- 修改IQC检验记录 -->
@ -2007,6 +2009,7 @@
<!-- IQC明细记录查询 -->
<select id="iqcDetailSearch" parameterType="QcFAIRecordData" resultType="QcFAIRecordData">
SELECT
site,
inspection_no,
template_id,
sampling_level_no,
@ -2029,16 +2032,18 @@
is_submit,
unqualified_quantity
FROM qc_iqc_detailed_record
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</select>
<!-- 查询IQC的子明细 -->
<select id="selectIQCSubDetailedRecord" parameterType="SubDetailValues" resultType="SubDetailValues">
SELECT sub_detail_value,
sampling_location,
is_submit
SELECT
site,
sub_detail_value,
sampling_location,
is_submit
FROM qc_iqc_sub_detail_record
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo}
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
</select>
<!-- 获取该项目的子明细值 -->
@ -2047,7 +2052,7 @@
sampling_location,
is_submit
FROM qc_iqc_sub_detail_record
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo}
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
</select>
<!-- 修改IQC主记录信息 -->
@ -2068,7 +2073,7 @@
UPDATE qc_iqc_detailed_record
SET item_result = #{itemResult},
unqualified_quantity = #{unqualifiedQuantity,jdbcType=DECIMAL}
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo}
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
</update>
<!-- 查询该记录明细是否已存在 -->
@ -2076,7 +2081,7 @@
SELECT inspection_no,
template_id
FROM qc_iqc_detailed_record
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</select>
<!-- 查询IQC检验记录是否已提交 -->
@ -2089,16 +2094,16 @@
<!-- 删除IQC子明细的老数据 -->
<delete id="delIQCSubDetailedRecord" parameterType="QcSubDetailInformationData">
DELETE FROM qc_iqc_sub_detail_record
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo}
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
</delete>
<!-- 新增IQC子明细信息 -->
<insert id="saveIQCSubDetailed">
INSERT INTO qc_iqc_sub_detail_record
(inspection_no, item_no, sub_detail_value, sampling_location)
(inspection_no, item_no, sub_detail_value, sampling_location, site)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation})
(#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site})
</foreach>
</insert>
@ -2114,14 +2119,14 @@
<update id="updateIQCDetailSubmitFlag" parameterType="QcFAIRecordData">
UPDATE qc_iqc_detailed_record
SET is_submit = 'Y'
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</update>
<!-- 修改IQC子明细记录标识为已提交 -->
<update id="updateIQCSubDetailSubmitFlag" parameterType="QcFAIRecordData">
UPDATE qc_iqc_sub_detail_record
SET is_submit = 'Y'
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</update>
<!-- 删除IQC检验记录 -->
@ -2133,13 +2138,13 @@
<!-- 删除IQC明细记录信息 -->
<delete id="deleteIQCDetailedRecord" parameterType="QcFAIRecordData">
DELETE FROM qc_iqc_detailed_record
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</delete>
<!-- 删除IQC子明细记录信息 -->
<delete id="deleteIQCSubDetailedRecord" parameterType="QcFAIRecordData">
DELETE FROM qc_iqc_sub_detail_record
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</delete>
<!-- 查询文件ID -->
@ -2241,7 +2246,9 @@
unqualified_qty,
submit_flag,
dbo.qc_get_cinv_source_code(site, part_no) as cinvSourceCode,
dbo.qc_get_sku(site, part_no) as sku
dbo.qc_get_sku(site, part_no) as sku,
seq_no,
batch_roll_no
FROM qc_fqc_record
<where>
site = #{query.site}
@ -2276,19 +2283,20 @@
<!-- 新增FQC明细记录信息 -->
<insert id="saveFQCDetailedRecord" parameterType="QcFAIRecordData">
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)
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})
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)
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})
</insert>
<!-- 新增FQC主记录信息 -->
<insert id="saveFQCRecord" parameterType="QcFAIRecordData">
INSERT INTO qc_fqc_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id)
VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId})
INSERT INTO qc_fqc_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no)
VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo})
</insert>
<!-- FQC明细记录查询 -->
<select id="fqcDetailSearch" parameterType="QcFAIRecordData" resultType="QcFAIRecordData">
SELECT
site,
inspection_no,
order_no,
template_id,
@ -2312,7 +2320,7 @@
is_submit,
unqualified_quantity
FROM qc_fqc_detailed_record
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</select>
<!-- 删除FQC检验记录 -->
@ -2324,13 +2332,13 @@
<!-- 删除FQC明细记录信息 -->
<delete id="deleteFQCDetailedRecord" parameterType="QcFAIRecordData">
DELETE FROM qc_fqc_detailed_record
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</delete>
<!-- 删除FQC子明细记录信息 -->
<delete id="deleteFQCSubDetailedRecord" parameterType="QcFAIRecordData">
DELETE FROM qc_fqc_sub_detail_record
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</delete>
<!-- 修改FQC主记录信息 -->
@ -2351,7 +2359,7 @@
UPDATE qc_fqc_detailed_record
SET item_result = #{itemResult},
unqualified_quantity = #{unqualifiedQuantity,jdbcType=DECIMAL}
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo}
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
</update>
<!-- 修改FQC主记录标识为已提交 -->
@ -2366,39 +2374,41 @@
<update id="updateFQCDetailSubmitFlag" parameterType="QcFAIRecordData">
UPDATE qc_fqc_detailed_record
SET is_submit = 'Y'
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</update>
<!-- 修改子明细记录标识为已提交 -->
<update id="updateFQCSubDetailSubmitFlag" parameterType="QcFAIRecordData">
UPDATE qc_fqc_sub_detail_record
SET is_submit = 'Y'
WHERE inspection_no = #{inspectionNo}
WHERE inspection_no = #{inspectionNo} and site = #{site}
</update>
<!-- 删除子明细的老数据 -->
<delete id="delFQCSubDetailedRecord" parameterType="QcSubDetailInformationData">
DELETE FROM qc_fqc_sub_detail_record
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo}
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
</delete>
<!-- 新增子明细信息 -->
<insert id="saveFQCSubDetailed">
INSERT INTO qc_fqc_sub_detail_record
(inspection_no, item_no, sub_detail_value, sampling_location)
(inspection_no, item_no, sub_detail_value, sampling_location, site)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation})
(#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site})
</foreach>
</insert>
<!-- 查询FQC的子明细 -->
<select id="selectFQCSubDetailedRecord" parameterType="SubDetailValues" resultType="SubDetailValues">
SELECT sub_detail_value,
sampling_location,
is_submit
SELECT
site,
sub_detail_value,
sampling_location,
is_submit
FROM qc_fqc_sub_detail_record
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo}
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
</select>
<!-- 查询FQC检验记录是否已提交 -->
@ -2414,13 +2424,13 @@
sampling_location,
is_submit
FROM qc_fqc_sub_detail_record
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo}
WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
</select>
<!-- 生成FQC检验单号 -->
<select id="selectFQCInspectionNo" resultType="string" parameterType="QcFAIRecordData">
SELECT
Right('0000000000'+ convert(VARCHAR(10), isnull(max(convert(INT,SUBSTRING(inspection_no,3,10))),0)+1),8)
Right('0000000000'+ convert(VARCHAR(10), isnull(max(convert(INT,SUBSTRING(inspection_no,4,10))),0)+1),8)
FROM qc_fqc_record
WHERE site = #{site}
</select>
@ -2428,7 +2438,7 @@
<!-- 生成IPQC检验单号 -->
<select id="selectIPQCInspectionNo" resultType="string" parameterType="QcFAIRecordData">
SELECT
Right('0000000000'+ convert(VARCHAR(10), isnull(max(convert(INT,SUBSTRING(inspection_no,3,10))),0)+1),8)
Right('0000000000'+ convert(VARCHAR(10), isnull(max(convert(INT,SUBSTRING(inspection_no,5,10))),0)+1),8)
FROM qc_ipqc_record
WHERE site = #{site}
</select>
@ -2436,7 +2446,7 @@
<!-- 生成FAI检验单号 -->
<select id="selectFAIInspectionNo" resultType="string" parameterType="QcFAIRecordData">
SELECT
Right('0000000000'+ convert(VARCHAR(10), isnull(max(convert(INT,SUBSTRING(inspection_no,3,10))),0)+1),8)
Right('0000000000'+ convert(VARCHAR(10), isnull(max(convert(INT,SUBSTRING(inspection_no,4,10))),0)+1),8)
FROM qc_fai_record
WHERE site = #{site}
</select>

Loading…
Cancel
Save