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 6a09fe37..53e5b939 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 @@ -4354,6 +4354,7 @@ public class QcServiceImpl implements QcService { } else { row.getCell(3).setCellType(CellType.STRING); task.setSubDetailValue(row.getCell(3).getStringCellValue()); + //task.setSubDetailValue(String.valueOf(row.getCell(3).getRawValue())); // map中是否已存在该key if (!countMap.containsKey(task.getItemNo())) { // 没有则新建并赋初始值 countMap.put(task.getItemNo(), 0); diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 1dcf578b..ea60cc27 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -183,14 +183,14 @@ sampling_programme_no = #{samplingProgrammeNo}, sampling_level_no = #{samplingLevelNo}, default_sampling_proportion = #{defaultSamplingProportion} - WHERE site = #{site} and ItemNo = #{itemNo} and ItemType = #{itemType} + WHERE site = #{site} and ItemNo = #{itemNo} and ItemType = #{itemType} and bu_no = #{buNo} UPDATE qc_method_item SET method_no = #{methodNo} - WHERE site = #{site} and ItemNo = #{itemNo} + WHERE site = #{site} and ItemNo = #{itemNo} and bu_no = #{buNo}