From b9a5f190d5d3689bee4d9a0e19580d0963b1d5fb Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 17 Oct 2025 14:05:06 +0800 Subject: [PATCH] =?UTF-8?q?feat(qc):=20=E6=96=B0=E5=A2=9E=E5=AE=9E?= =?UTF-8?q?=E9=99=85=E6=B5=8B=E9=87=8F=E5=80=BC=E5=AD=97=E6=AE=B5=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在WmsCheckItemVo中添加actualMeasure字段 - 更新WmsCheckTaskMapper.xml以查询actual_measure数据- 修改WmsCheckTaskServiceImpl以处理actualMeasures数组并设置实际测量值 --- .../src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java | 2 ++ .../com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java | 2 ++ klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java index 24e170e4..ac4fe28d 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java @@ -56,4 +56,6 @@ public class WmsCheckItemVo { private Long checkTaskItemId; + private String actualMeasure; + } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java index 9efd909d..779842c2 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java @@ -56,6 +56,7 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService { 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[] qualitativeQuantitatives = vo.getQualitativeQuantitatives() != null ? vo.getQualitativeQuantitatives().split(",") : new String[ids.length]; + String[] actualMeasures = vo.getActualMeasures() != null ? vo.getActualMeasures().split(",") : new String[ids.length]; List itemList = new ArrayList<>(); 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])) { item.setQualitativeQuantitative(Integer.parseInt(qualitativeQuantitatives[i])); } + if (actualMeasures.length > i) item.setActualMeasure(actualMeasures[i]); itemList.add(item); } } diff --git a/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml index f2f611c6..87b5a9a0 100644 --- a/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml @@ -41,7 +41,8 @@ GROUP_CONCAT(ti.target_lower) AS targetLowers, GROUP_CONCAT(ti.standard_target) AS standardTargets, 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 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