feat(qc): 新增实际测量值字段支持
- 在WmsCheckItemVo中添加actualMeasure字段 - 更新WmsCheckTaskMapper.xml以查询actual_measure数据- 修改WmsCheckTaskServiceImpl以处理actualMeasures数组并设置实际测量值
This commit is contained in:
@@ -56,4 +56,6 @@ public class WmsCheckItemVo {
|
|||||||
|
|
||||||
private Long checkTaskItemId;
|
private Long checkTaskItemId;
|
||||||
|
|
||||||
|
private String actualMeasure;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
|
|||||||
String[] standardTargets = vo.getStandardTargets() != null ? vo.getStandardTargets().split(",") : new String[ids.length];
|
String[] standardTargets = vo.getStandardTargets() != null ? vo.getStandardTargets().split(",") : new String[ids.length];
|
||||||
String[] units = vo.getUnits() != null ? vo.getUnits().split(",") : new String[ids.length];
|
String[] units = vo.getUnits() != null ? vo.getUnits().split(",") : new String[ids.length];
|
||||||
String[] qualitativeQuantitatives = vo.getQualitativeQuantitatives() != null ? vo.getQualitativeQuantitatives().split(",") : new String[ids.length];
|
String[] qualitativeQuantitatives = vo.getQualitativeQuantitatives() != null ? vo.getQualitativeQuantitatives().split(",") : new String[ids.length];
|
||||||
|
String[] actualMeasures = vo.getActualMeasures() != null ? vo.getActualMeasures().split(",") : new String[ids.length];
|
||||||
|
|
||||||
List<WmsCheckItemVo> itemList = new ArrayList<>();
|
List<WmsCheckItemVo> itemList = new ArrayList<>();
|
||||||
for (int i = 0; i < ids.length; i++) {
|
for (int i = 0; i < ids.length; i++) {
|
||||||
@@ -84,6 +85,7 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
|
|||||||
if (qualitativeQuantitatives.length > i && StringUtils.isNotBlank(qualitativeQuantitatives[i])) {
|
if (qualitativeQuantitatives.length > i && StringUtils.isNotBlank(qualitativeQuantitatives[i])) {
|
||||||
item.setQualitativeQuantitative(Integer.parseInt(qualitativeQuantitatives[i]));
|
item.setQualitativeQuantitative(Integer.parseInt(qualitativeQuantitatives[i]));
|
||||||
}
|
}
|
||||||
|
if (actualMeasures.length > i) item.setActualMeasure(actualMeasures[i]);
|
||||||
itemList.add(item);
|
itemList.add(item);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,7 +41,8 @@
|
|||||||
GROUP_CONCAT(ti.target_lower) AS targetLowers,
|
GROUP_CONCAT(ti.target_lower) AS targetLowers,
|
||||||
GROUP_CONCAT(ti.standard_target) AS standardTargets,
|
GROUP_CONCAT(ti.standard_target) AS standardTargets,
|
||||||
GROUP_CONCAT(ti.unit) AS units,
|
GROUP_CONCAT(ti.unit) AS units,
|
||||||
GROUP_CONCAT(ti.qualitative_quantitative) AS qualitativeQuantitatives
|
GROUP_CONCAT(ti.qualitative_quantitative) AS qualitativeQuantitatives,
|
||||||
|
GROUP_CONCAT(ti.actual_measure) AS actualMeasures
|
||||||
FROM wms_check_task t
|
FROM wms_check_task t
|
||||||
LEFT JOIN wms_check_task_item ti ON t.task_id = ti.check_task_id AND ti.del_flag = 0
|
LEFT JOIN wms_check_task_item ti ON t.task_id = ti.check_task_id AND ti.del_flag = 0
|
||||||
LEFT JOIN wms_check_item i ON ti.check_item_id = i.item_id AND i.del_flag = 0
|
LEFT JOIN wms_check_item i ON ti.check_item_id = i.item_id AND i.del_flag = 0
|
||||||
|
|||||||
Reference in New Issue
Block a user