Commit d3dcafc5 by zxn

sku获取配置修改

parent 1f446391
......@@ -91,4 +91,23 @@ public class SuperBomSkuConfigInfo implements Serializable {
private String cvCode;
@Transient
private String zphCode;
/**
* id
*/
@Transient
private String zphName;
/**
* id
*/
@Transient
private String h3cCValue;
/**
* id
*/
@Transient
private String h3cDeliverCode;
}
\ No newline at end of file
......@@ -9,6 +9,7 @@ import lombok.experimental.Accessors;
import javax.persistence.Column;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.ArrayList;
......@@ -176,6 +177,12 @@ public class SuperBomSkuInfo extends BasePageDto implements Serializable {
@Column(name = "id")
private String id;
private ArrayList<SuperBomSkuConfigInfo> characteristicList;
/**
* setUnisSalesName
*/
@Transient
private String unisSalesName;
private List<SuperBomSkuConfigInfo> characteristicList;
}
\ No newline at end of file
......@@ -692,7 +692,7 @@ public class IntegrateServiceImpl implements IntegrateService {
configurableBom = characteristicMapper.getSuperBomInfo(Long.valueOf(config));
}
//根据特征值名称获取物料的信息
ConfigurableBomDto dto = new ConfigurableBomDto();
SuperBomSkuInfo dto = new SuperBomSkuInfo();
dto.setSuperBomCode(configurableBom.getSuperBomCode());
dto.setSuperBomName(configurableBom.getSuperBomName());
dto.setProductClassCode(configurableBom.getProductClassCode());
......@@ -709,26 +709,26 @@ public class IntegrateServiceImpl implements IntegrateService {
dto.setProductSmallType(configurableBom.getProductSmallType());
ConfigurableBom finalConfigurableBom = configurableBom;
List<Map<String, Object>> selectedCharacteristicList = (List<Map<String, Object>>) map.get("selectedCharacteristicList");
List<CharacteristicAndValueDto> cDtos = new ArrayList<>();
List<SuperBomSkuConfigInfo> characteristicList = new ArrayList<>();
selectedCharacteristicList.forEach(item -> {
CharacteristicAndValueDto cDto = new CharacteristicAndValueDto();
SuperBomSkuConfigInfo superBomSkuConfigInfo = new SuperBomSkuConfigInfo();
String characteristicValueName = (String) item.get("characteristicValueName");
String characteristicName = (String) item.get("characteristicName");
CharacteristicValue characteristicValue = characteristicValueMapper.getCharacteristicValueInfoByName(characteristicValueName, finalConfigurableBom.getSuperBomCode(), characteristicName);
cDto.setCharacteristicCode(characteristicValue.getCharacteristicCode());
cDto.setCharacteristicName(characteristicValue.getCharacteristicName());
cDto.setUnisSalesCName(characteristicValue.getUnisSalesCName());
cDto.setH3cCCode(characteristicValue.getH3cCCode());
cDto.setCharacteristicValueCode(characteristicValue.getCharacteristicValueCode());
cDto.setCharacteristicValueName(characteristicValue.getCharacteristicValueName());
cDto.setZphCode(characteristicValue.getZphCode());
cDto.setZphName(characteristicValue.getZphName());
cDto.setUnisSalesVName(characteristicValue.getUnisSalesVName());
cDto.setH3cCValue(characteristicValue.getH3cCValue());
cDto.setH3cDeliverCode(characteristicValue.getH3cDeliverCode());
cDtos.add(cDto);
superBomSkuConfigInfo.setCharacteristicCode(characteristicValue.getCharacteristicCode());
superBomSkuConfigInfo.setCharacteristicName(characteristicValue.getCharacteristicName());
superBomSkuConfigInfo.setUnisSalesCName(characteristicValue.getUnisSalesCName());
superBomSkuConfigInfo.setH3cCCode(characteristicValue.getH3cCCode());
superBomSkuConfigInfo.setCharacteristicValueCode(characteristicValue.getCharacteristicValueCode());
superBomSkuConfigInfo.setCharacteristicValueName(characteristicValue.getCharacteristicValueName());
superBomSkuConfigInfo.setZphCode(characteristicValue.getZphCode());
superBomSkuConfigInfo.setZphName(characteristicValue.getZphName());
superBomSkuConfigInfo.setUnisSalesVName(characteristicValue.getUnisSalesVName());
superBomSkuConfigInfo.setH3cCValue(characteristicValue.getH3cCValue());
superBomSkuConfigInfo.setH3cDeliverCode(characteristicValue.getH3cDeliverCode());
characteristicList.add(superBomSkuConfigInfo);
});
dto.setCharacteristicList(cDtos);
dto.setCharacteristicList(characteristicList);
map.put("superBomInfo", dto);
//规范选配器出参
map.remove("configId");
......
......@@ -178,7 +178,7 @@
</select>
<select id="getConfigId" resultType="java.lang.String">
select config_id from super_bom_sku_info where sku_code = #{skuCode}
select config_id from super_bom_sku_info where sku_code = #{skuCode} limit 1
</select>
<select id="getSkuInfoByConfigId" resultMap="SuperBomSkuMap">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment