diff --git a/src/main/java/com/jtem/modules/pda/dao/ToolDetailMapper.java b/src/main/java/com/jtem/modules/pda/dao/ToolDetailMapper.java index ab81cb5..58918bf 100644 --- a/src/main/java/com/jtem/modules/pda/dao/ToolDetailMapper.java +++ b/src/main/java/com/jtem/modules/pda/dao/ToolDetailMapper.java @@ -225,4 +225,6 @@ public interface ToolDetailMapper { IPage getToolAttributeList(Page partSubPropertiesValueDataPage,@Param("query") PartSubPropertiesValueData data); IPage getToolCostList(Page partSubPropertiesValueDataPage,@Param("query") ToolCostData data); + + List getAvailableValueList(PartSubPropertiesValueData inData); } diff --git a/src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java b/src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java index 76f1e88..276df0f 100644 --- a/src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java +++ b/src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java @@ -732,8 +732,14 @@ public class ToolHeaderServiceImpl implements ToolHeaderService { toolHeaderMapper.savePartSubPropertiesValue(getHeaderData); } } - return toolDetailMapper.getItemModal(data); - + List result= toolDetailMapper.getItemModal(data); + for (int i = 0; i < result.size(); i++) { + if("Y".equals(result.get(i).getValueChooseFlag())){ + List availableList=toolDetailMapper.getAvailableValueList(result.get(i)); + result.get(i).setAvailableValueList(availableList); + } + } + return result; } @Override diff --git a/src/main/java/com/jtem/modules/toolMan/entity/PartSubPropertiesValueData.java b/src/main/java/com/jtem/modules/toolMan/entity/PartSubPropertiesValueData.java index a90ceb2..cf479c1 100644 --- a/src/main/java/com/jtem/modules/toolMan/entity/PartSubPropertiesValueData.java +++ b/src/main/java/com/jtem/modules/toolMan/entity/PartSubPropertiesValueData.java @@ -1,7 +1,10 @@ package com.jtem.modules.toolMan.entity; import com.jtem.common.utils.QueryPage; +import org.apache.ibatis.type.Alias; +import java.util.List; +@Alias("PartSubPropertiesValueData") public class PartSubPropertiesValueData extends QueryPage { private String partNo; private String site; @@ -19,6 +22,7 @@ public class PartSubPropertiesValueData extends QueryPage { private String valueChooseFlag; // 工具名称 private String toolDescription; + private List availableValueList; public String getToolDescription() { return toolDescription; @@ -139,5 +143,13 @@ public class PartSubPropertiesValueData extends QueryPage { public void setValueChooseFlag(String valueChooseFlag) { this.valueChooseFlag = valueChooseFlag; } + + public List getAvailableValueList() { + return availableValueList; + } + + public void setAvailableValueList(List availableValueList) { + this.availableValueList = availableValueList; + } } diff --git a/src/main/java/com/jtem/modules/toolMan/entity/PropertiesItemAvailableValueData.java b/src/main/java/com/jtem/modules/toolMan/entity/PropertiesItemAvailableValueData.java new file mode 100644 index 0000000..a144862 --- /dev/null +++ b/src/main/java/com/jtem/modules/toolMan/entity/PropertiesItemAvailableValueData.java @@ -0,0 +1,43 @@ +package com.jtem.modules.toolMan.entity; + +public class PropertiesItemAvailableValueData { + /** + * + */ + private String itemNo; + + /** + * + */ + private Double valueNo; + + /** + * + */ + private String availableValue; + + public String getItemNo() { + return itemNo; + } + + public void setItemNo(String itemNo) { + this.itemNo = itemNo; + } + + public Double getValueNo() { + return valueNo; + } + + public void setValueNo(Double valueNo) { + this.valueNo = valueNo; + } + + public String getAvailableValue() { + return availableValue; + } + + public void setAvailableValue(String availableValue) { + this.availableValue = availableValue; + } +} + diff --git a/src/main/java/com/jtem/modules/toolMan/entity/ToolCostData.java b/src/main/java/com/jtem/modules/toolMan/entity/ToolCostData.java index 119e17b..badcd68 100644 --- a/src/main/java/com/jtem/modules/toolMan/entity/ToolCostData.java +++ b/src/main/java/com/jtem/modules/toolMan/entity/ToolCostData.java @@ -2,9 +2,12 @@ package com.jtem.modules.toolMan.entity; import com.fasterxml.jackson.annotation.JsonFormat; import com.jtem.common.utils.QueryPage; +import org.apache.ibatis.type.Alias; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; + +@Alias("ToolCostData") public class ToolCostData extends QueryPage { /** 工厂 */ diff --git a/src/main/resources/mapper/pda/ToolDetailMapper.xml b/src/main/resources/mapper/pda/ToolDetailMapper.xml index 9f2d527..536ac9c 100644 --- a/src/main/resources/mapper/pda/ToolDetailMapper.xml +++ b/src/main/resources/mapper/pda/ToolDetailMapper.xml @@ -722,4 +722,8 @@ + +