no message
							parent
							
								
									552d61690f
								
							
						
					
					
						commit
						914d45a479
					
				| 
						 | 
					@ -328,7 +328,7 @@ public class LocationService {
 | 
				
			||||||
            //库位
 | 
					            //库位
 | 
				
			||||||
            LocationEntity location = exitLocationMap.get(locationsImportForm.getLocationCode());
 | 
					            LocationEntity location = exitLocationMap.get(locationsImportForm.getLocationCode());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            //库位为空则更新,否则新增
 | 
					            //库位为空则新增,否则更新
 | 
				
			||||||
            if (location == null) {
 | 
					            if (location == null) {
 | 
				
			||||||
                insertToLocation.add(createLocation(locationsImportForm.getLocationCode(), area.getAreaId(), locationType));
 | 
					                insertToLocation.add(createLocation(locationsImportForm.getLocationCode(), area.getAreaId(), locationType));
 | 
				
			||||||
            } else {
 | 
					            } else {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -44,6 +44,6 @@ public class ValidateDictKey {
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return selectByKeyCode.stream()
 | 
					        return selectByKeyCode.stream()
 | 
				
			||||||
                .collect(Collectors.toMap(DictDataVO::getDataValue,DictDataVO::getDataLabel));
 | 
					                .collect(Collectors.toMap(DictDataVO::getDataLabel,DictDataVO::getDataValue));
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue