| Line 131... |
Line 131... |
| 131 |
long count = 0;
|
131 |
long count = 0;
|
| 132 |
StringBuffer sb = new StringBuffer();
|
132 |
StringBuffer sb = new StringBuffer();
|
| 133 |
for(Item item:items){
|
133 |
for(Item item:items){
|
| 134 |
long entityId = item.getCatalogItemId();
|
134 |
long entityId = item.getCatalogItemId();
|
| 135 |
Entity entity = entities.get(entityId);
|
135 |
Entity entity = entities.get(entityId);
|
| - |
|
136 |
if(entity==null){
|
| - |
|
137 |
continue;
|
| - |
|
138 |
}
|
| 136 |
String itemBrand = item.getBrand();
|
139 |
String itemBrand = item.getBrand();
|
| 137 |
String itemModelName = item.getModelName();
|
140 |
String itemModelName = item.getModelName();
|
| 138 |
String itemModelNumber = item.getModelNumber();
|
141 |
String itemModelNumber = item.getModelNumber();
|
| 139 |
String entityBrand = entity.getBrand();
|
142 |
String entityBrand = entity.getBrand();
|
| 140 |
String entityModelName = entity.getModelName();
|
143 |
String entityModelName = entity.getModelName();
|
| 141 |
String entityModelNumber = entity.getModelNumber();
|
144 |
String entityModelNumber = entity.getModelNumber();
|
| 142 |
|
145 |
|
| 143 |
if(itemBrand.equals(entityBrand) && itemModelName.equals(entityModelName) && itemModelNumber.equals(entityModelNumber)){
|
146 |
if(itemBrand.equals(entityBrand) && itemModelNumber.equals(entityModelNumber)){
|
| - |
|
147 |
if(itemModelName!=null && entityModelName !=null && itemModelName.equals(entityModelName)){
|
| - |
|
148 |
continue;
|
| - |
|
149 |
}else if(itemModelName==null && entityModelName ==null){
|
| 144 |
continue;
|
150 |
continue;
|
| - |
|
151 |
}
|
| - |
|
152 |
|
| 145 |
}
|
153 |
}
|
| 146 |
count++;
|
154 |
count++;
|
| 147 |
sb.append(count + ") Item: " + itemBrand + " " + itemModelName + " " + itemModelNumber);
|
155 |
sb.append(count + ") Item: " + itemBrand + "\t" + itemModelName + "\t" + itemModelNumber+ "\t"+ item.getId() + "\n");
|
| 148 |
sb.append(count + ") Entity: " + entityBrand + " " + entityModelName + " " + entityModelNumber);
|
156 |
sb.append(count + ") Entity: " + entityBrand + "\t" + entityModelName + "\t" + entityModelNumber+ "\t" + entity.getID() + "\n");
|
| - |
|
157 |
|
| 149 |
if(dryRun.equals("false")){
|
158 |
if(dryRun.equals("false")){
|
| 150 |
item.setBrand(entity.getBrand());
|
159 |
item.setBrand(entity.getBrand());
|
| 151 |
item.setModelName(entity.getModelName());
|
160 |
item.setModelName(entity.getModelName());
|
| 152 |
item.setModelNumber(entity.getModelNumber());
|
161 |
item.setModelNumber(entity.getModelNumber());
|
| 153 |
client.updateItem(item);
|
162 |
client.updateItem(item);
|