|
@@ -83,14 +83,14 @@ public class VenderUtil {
|
|
|
if (infoCodeSet.contains("DPBrandID") && infoCodeSet.contains("Brand")) {
|
|
|
processBrand(item);
|
|
|
}
|
|
|
- if (infoCodeSet.contains("DPMaintainerID") && (infoCodeSet.contains("Maintainer") || infoCodeSet.contains("MaintainerContacto") || infoCodeSet.contains("MaintainerPhone"))) {
|
|
|
- processNameContactPhone(item, "DPMaintainerID", "Maintainer", "MaintainerContacto", "MaintainerPhone");
|
|
|
+ if (infoCodeSet.contains("DPMaintainerID") && (infoCodeSet.contains("Maintainer") || infoCodeSet.contains("MaintainerContactor") || infoCodeSet.contains("MaintainerPhone"))) {
|
|
|
+ processNameContactPhone(item, "DPMaintainerID", "Maintainer", "MaintainerContactor", "MaintainerPhone");
|
|
|
}
|
|
|
- if (infoCodeSet.contains("DPManufacturerID") && (infoCodeSet.contains("Manufacturer") || infoCodeSet.contains("ManufacturerContacto") || infoCodeSet.contains("ManufacturerPhone"))) {
|
|
|
- processNameContactPhone(item, "DPManufacturerID", "Manufacturer", "ManufacturerContacto", "ManufacturerPhone");
|
|
|
+ if (infoCodeSet.contains("DPManufacturerID") && (infoCodeSet.contains("Manufacturer") || infoCodeSet.contains("ManufacturerContactor") || infoCodeSet.contains("ManufacturerPhone"))) {
|
|
|
+ processNameContactPhone(item, "DPManufacturerID", "Manufacturer", "ManufacturerContactor", "ManufacturerPhone");
|
|
|
}
|
|
|
- if (infoCodeSet.contains("DPSupplierID") && (infoCodeSet.contains("Supplier") || infoCodeSet.contains("SupplierContacto") || infoCodeSet.contains("SupplierPhone"))) {
|
|
|
- processNameContactPhone(item, "DPSupplierID", "Supplier", "SupplierContacto", "SupplierPhone");
|
|
|
+ if (infoCodeSet.contains("DPSupplierID") && (infoCodeSet.contains("Supplier") || infoCodeSet.contains("SupplierContactor") || infoCodeSet.contains("SupplierPhone"))) {
|
|
|
+ processNameContactPhone(item, "DPSupplierID", "Supplier", "SupplierContactor", "SupplierPhone");
|
|
|
}
|
|
|
if (infoCodeSet.contains("DPSpecificationID") && infoCodeSet.contains("Specification")) {
|
|
|
processSpecific(item);
|
|
@@ -193,7 +193,9 @@ public class VenderUtil {
|
|
|
ObjectInfoRecord phoneRecord = null;
|
|
|
|
|
|
for(String key : item.keySet()) {
|
|
|
- if(key.startsWith(ctmInfoCode)) {
|
|
|
+ String infoCode = key.split("@")[0];
|
|
|
+
|
|
|
+ if(infoCode.equals(ctmInfoCode)) {
|
|
|
if(null == newCTMRecord) {
|
|
|
newCTMRecord = item.get(key);
|
|
|
}else {
|
|
@@ -201,7 +203,7 @@ public class VenderUtil {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if(key.startsWith(nameCode)) {
|
|
|
+ if(infoCode.equals(nameCode)) {
|
|
|
if(null == nameRecord) {
|
|
|
nameRecord = item.get(key);
|
|
|
}else {
|
|
@@ -209,7 +211,7 @@ public class VenderUtil {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if(key.startsWith(contactCode)) {
|
|
|
+ if(infoCode.equals(contactCode)) {
|
|
|
if(null == contactRecord) {
|
|
|
contactRecord = item.get(key);
|
|
|
}else {
|
|
@@ -217,7 +219,7 @@ public class VenderUtil {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if(key.startsWith(phoneCode)) {
|
|
|
+ if(infoCode.equals(phoneCode)) {
|
|
|
if(null == phoneRecord) {
|
|
|
phoneRecord = item.get(key);
|
|
|
}else {
|