wilson
/
xz-java
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2024-07-02 

功能优化
master
fengyuan_yang 2 years ago
parent
046de41029
commit
72deabd846
3 changed files with 70 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
  2. 90
      src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
  3. 14
      src/main/resources/mapper/pms/QcMapper.xml

18
src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
View File

@ -260,6 +260,24 @@ public class QcFAIRecordData extends QueryPage {
private String orderRef3;
private String orderRef4;
private String orderRef5;
private String warehouseId;
private String warehouseName;
public String getWarehouseId() {
return warehouseId;
}
public void setWarehouseId(String warehouseId) {
this.warehouseId = warehouseId;
}
public String getWarehouseName() {
return warehouseName;
}
public void setWarehouseName(String warehouseName) {
this.warehouseName = warehouseName;
}
public String getOrderRef1() {
return orderRef1;

90
src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
View File

@ -3616,6 +3616,7 @@ public class QcServiceImpl implements QcService {
qcFAIRecordData.setInspectionTypeNo("105"); // 检验类型编码
qcFAIRecordData.setPartDesc(recordData.getPartDesc());
qcFAIRecordData.setRollQty(recordData.getRollQty());
qcFAIRecordData.setSamplingQty(recordData.getSamplingQty());
// 明细记录信息赋值
String partNo = recordData.getPartNo();
String attributeType1 = "A";
@ -3628,27 +3629,27 @@ public class QcServiceImpl implements QcService {
}
// 获取抽样数量
// 如果该检验模板有维护抽样方案
if (StringUtils.isNotBlank(partAttribute.get(0).getSamplingProgrammeNo())) {
QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData();
samplingInspectionProgrammeData.setSite(partAttribute.get(0).getSite());
samplingInspectionProgrammeData.setBuNo(partAttribute.get(0).getBuNo());
samplingInspectionProgrammeData.setSamplingProgrammeNo(partAttribute.get(0).getSamplingProgrammeNo());
// 获取抽样方案维护的矩阵详情
List<QcSamplingInspectionProgrammeData> dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData);
// 根据抽样方案确定抽样数
for (QcSamplingInspectionProgrammeData programmeData : dataList) {
if (programmeData.getSamplingLevelNo().equals(partAttribute.get(0).getSamplingLevelNo()) && (recordData.getRollCount().compareTo(programmeData.getMinQty()) > 0 || recordData.getRollCount().compareTo(programmeData.getMinQty()) == 0) && (recordData.getRollCount().compareTo(programmeData.getMaxQty()) < 0 || recordData.getRollCount().compareTo(programmeData.getMaxQty()) == 0) ){
qcFAIRecordData.setSamplingQty(programmeData.getSamplingQty());
}
}
} else if (partAttribute.get(0).getDefaultSamplingQuantity() != null) {
// 没有维护抽样方案，再根据默认抽样数来确定
qcFAIRecordData.setSamplingQty(partAttribute.get(0).getDefaultSamplingQuantity());
} else if (partAttribute.get(0).getDefaultSamplingProportion() != null) {
// 也没有维护默认抽样数，最后根据默认抽样比例来确定
BigDecimal d = partAttribute.get(0).getDefaultSamplingProportion().multiply(recordData.getRollCount()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP);
qcFAIRecordData.setSamplingQty(d);
}
// if (StringUtils.isNotBlank(partAttribute.get(0).getSamplingProgrammeNo())) {
// QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData();
// samplingInspectionProgrammeData.setSite(partAttribute.get(0).getSite());
// samplingInspectionProgrammeData.setBuNo(partAttribute.get(0).getBuNo());
// samplingInspectionProgrammeData.setSamplingProgrammeNo(partAttribute.get(0).getSamplingProgrammeNo());
// // 获取抽样方案维护的矩阵详情
// List<QcSamplingInspectionProgrammeData> dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData);
// // 根据抽样方案确定抽样数
// for (QcSamplingInspectionProgrammeData programmeData : dataList) {
// if (programmeData.getSamplingLevelNo().equals(partAttribute.get(0).getSamplingLevelNo()) && (recordData.getRollCount().compareTo(programmeData.getMinQty()) > 0 || recordData.getRollCount().compareTo(programmeData.getMinQty()) == 0) && (recordData.getRollCount().compareTo(programmeData.getMaxQty()) < 0 || recordData.getRollCount().compareTo(programmeData.getMaxQty()) == 0) ){
// qcFAIRecordData.setSamplingQty(programmeData.getSamplingQty());
// }
// }
// } else if (partAttribute.get(0).getDefaultSamplingQuantity() != null) {
// // 没有维护抽样方案，再根据默认抽样数来确定
// qcFAIRecordData.setSamplingQty(partAttribute.get(0).getDefaultSamplingQuantity());
// } else if (partAttribute.get(0).getDefaultSamplingProportion() != null) {
// // 也没有维护默认抽样数，最后根据默认抽样比例来确定
// BigDecimal d = partAttribute.get(0).getDefaultSamplingProportion().multiply(recordData.getRollCount()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP);
// qcFAIRecordData.setSamplingQty(d);
// }
// 获取根据该检验模板下维护的检验项目
QcTemplateData templateData = new QcTemplateData();
@ -3721,26 +3722,26 @@ public class QcServiceImpl implements QcService {
}
// 获取抽样数量
// 如果该检验模板有维护抽样方案
if (StringUtils.isNotBlank(familyAttribute.get(0).getSamplingProgrammeNo())) {
QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData();
samplingInspectionProgrammeData.setSite(familyAttribute.get(0).getSite());
samplingInspectionProgrammeData.setBuNo(familyAttribute.get(0).getBuNo());
samplingInspectionProgrammeData.setSamplingProgrammeNo(familyAttribute.get(0).getSamplingProgrammeNo());
// 获取抽样方案维护的矩阵详情
List<QcSamplingInspectionProgrammeData> dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData);
// 根据抽样方案确定抽样数
for (QcSamplingInspectionProgrammeData programmeData : dataList) {
if (programmeData.getSamplingLevelNo().equals(familyAttribute.get(0).getSamplingLevelNo()) && (recordData.getRollCount().compareTo(programmeData.getMinQty()) > 0 || recordData.getRollCount().compareTo(programmeData.getMinQty()) == 0) && (recordData.getRollCount().compareTo(programmeData.getMaxQty()) < 0 || recordData.getRollCount().compareTo(programmeData.getMaxQty()) == 0) ){
qcFAIRecordData.setSamplingQty(programmeData.getSamplingQty());
}
}
} else if (familyAttribute.get(0).getDefaultSamplingQuantity() != null) {
// 没有维护抽样方案，再根据默认抽样数来确定
qcFAIRecordData.setSamplingQty(familyAttribute.get(0).getDefaultSamplingQuantity());
} else if (familyAttribute.get(0).getDefaultSamplingProportion() != null) {
// 也没有维护默认抽样数，最后根据默认抽样比例来确定
qcFAIRecordData.setSamplingQty(familyAttribute.get(0).getDefaultSamplingProportion().multiply(qcFAIRecordData.getRollCount()).divide(new BigDecimal(100),3,BigDecimal.ROUND_HALF_UP));
}
// if (StringUtils.isNotBlank(familyAttribute.get(0).getSamplingProgrammeNo())) {
// QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData();
// samplingInspectionProgrammeData.setSite(familyAttribute.get(0).getSite());
// samplingInspectionProgrammeData.setBuNo(familyAttribute.get(0).getBuNo());
// samplingInspectionProgrammeData.setSamplingProgrammeNo(familyAttribute.get(0).getSamplingProgrammeNo());
// // 获取抽样方案维护的矩阵详情
// List<QcSamplingInspectionProgrammeData> dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData);
// // 根据抽样方案确定抽样数
// for (QcSamplingInspectionProgrammeData programmeData : dataList) {
// if (programmeData.getSamplingLevelNo().equals(familyAttribute.get(0).getSamplingLevelNo()) && (recordData.getRollCount().compareTo(programmeData.getMinQty()) > 0 || recordData.getRollCount().compareTo(programmeData.getMinQty()) == 0) && (recordData.getRollCount().compareTo(programmeData.getMaxQty()) < 0 || recordData.getRollCount().compareTo(programmeData.getMaxQty()) == 0) ){
// qcFAIRecordData.setSamplingQty(programmeData.getSamplingQty());
// }
// }
// } else if (familyAttribute.get(0).getDefaultSamplingQuantity() != null) {
// // 没有维护抽样方案，再根据默认抽样数来确定
// qcFAIRecordData.setSamplingQty(familyAttribute.get(0).getDefaultSamplingQuantity());
// } else if (familyAttribute.get(0).getDefaultSamplingProportion() != null) {
// // 也没有维护默认抽样数，最后根据默认抽样比例来确定
// qcFAIRecordData.setSamplingQty(familyAttribute.get(0).getDefaultSamplingProportion().multiply(qcFAIRecordData.getRollCount()).divide(new BigDecimal(100),3,BigDecimal.ROUND_HALF_UP));
// }
// 获取根据该检验模板下维护的检验项目
QcTemplateData templateData = new QcTemplateData();
@ -4043,13 +4044,6 @@ public class QcServiceImpl implements QcService {
System.out.println("字符串转换数值失败(receiptItemNo): " + inData.getReceiptItemNo());
}
String inspectDate = sdf.format(inData.getInspectorDate());
// Date inspectDate;
// try {
// String format = sdf.format(inData.getInspectorDate());
// inspectDate = sdf.parse(format); // 检验日期
// } catch (ParseException e) {
// throw new RuntimeException("检验日期处理失败：", e);
// }
Float arriveQty = inData.getRollCount().floatValue(); // 送检数量
Float qtyInspected = inData.getSamplingQty().floatValue(); // 检验数量/抽样数量
Float qtyApproved = inData.getPassQty() == null ? 0 : inData.getPassQty().floatValue();// 合格数量

14
src/main/resources/mapper/pms/QcMapper.xml
View File

@ -2190,7 +2190,8 @@
qir.bu_no,
qir.po_orderNo,
qir.po_itemNo,
qir.roll_count
qir.roll_count,
qir.sampling_qty
FROM qc_iqc_record as qir
LEFT JOIN part p ON qir.part_no = p.partNo and qir.site = p.site
WHERE qir.site in (select site from eam_access_site where username = #{userName})
@ -2212,7 +2213,7 @@
inspection_cycle = #{inspectionCycle},
part_desc = #{partDesc},
detail_flag = 'Y',
pass_qty = sampling_qty,
pass_qty = #{samplingQty},
not_pass_qty = 0
WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo}
</update>
@ -2261,7 +2262,9 @@
ref_info1,
ref_info2,
ref_info3,
ref_info4
ref_info4,
warehouse_id,
dbo.Get_WareHouseDesc(site, warehouse_id) as warehouseName
FROM qc_iqc_record
<where>
site in (select site from eam_access_site where username = #{query.userName})
@ -2317,6 +2320,9 @@
<if test = "query.orderType != null and query.orderType != ''">
AND dbo.qc_get_order_type(site, po_orderNo, po_itemNo) = #{query.orderType}
</if>
<if test = "query.warehouseName != null and query.warehouseName != ''">
AND dbo.Get_WareHouseDesc(site, warehouse_id) LIKE '%' + #{query.warehouseName} + '%'
</if>
</where>
ORDER BY
CASE WHEN state = '待检验' THEN 1
@ -3496,7 +3502,7 @@
inspection_cycle = #{inspectionCycle},
part_desc = #{partDesc},
detail_flag = 'Y',
pass_qty = sampling_qty,
pass_qty = #{samplingQty},
not_pass_qty = 0
WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo}
</update>

Write Preview
Loading…
Cancel
Save